[Phpgroupware-cvs] phpgwapi/inc class.common.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Dave Hall <address@hidden>      06/02/20 04:14:14

Modified files:
        inc            : class.common.inc.php 

Log message:
        fix template selection fallback

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.common.inc.php.diff?tr1=1.230&tr2=1.231&r1=text&r2=text

Patches:
Index: phpgwapi/inc/class.common.inc.php
diff -u phpgwapi/inc/class.common.inc.php:1.230 
phpgwapi/inc/class.common.inc.php:1.231
--- phpgwapi/inc/class.common.inc.php:1.230     Tue Feb 14 10:01:05 2006
+++ phpgwapi/inc/class.common.inc.php   Mon Feb 20 04:14:14 2006
@@ -8,7 +8,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage utilities
-       * @version $Id: class.common.inc.php,v 1.230 2006/02/14 10:01:05 
skwashd Exp $
+       * @version $Id: class.common.inc.php,v 1.231 2006/02/20 04:14:14 
skwashd Exp $
        */
 
        $d1 = strtolower(@substr(PHPGW_API_INC,0,3));
@@ -782,19 +782,19 @@
                                
$GLOBALS['phpgw_info']['server']['template_set'] = 'base';
                        }
 
-                       $tpldir         = PHPGW_SERVER_ROOT . '/' . $appname . 
'/templates/' . $GLOBALS['phpgw_info']['server']['template_set'];
-                       $tpldir_default = PHPGW_SERVER_ROOT . '/' . $appname . 
'/templates/simple';
+                       $tpldir         = PHPGW_SERVER_ROOT . 
"/{$appname}/templates/{$GLOBALS['phpgw_info']['server']['template_set']}";
+                       $tpldir_default = PHPGW_SERVER_ROOT . 
"/{$appname}/templates/base";
 
                        if ($layout)
                        {
-                               $tpldir = $tpldir_default = PHPGW_SERVER_ROOT . 
'/' . $appname . '/templates/' . $layout;
+                               $tpldir = $tpldir_default = PHPGW_SERVER_ROOT . 
"/{$appname}/templates/{$layout}";
                        }
 
-                       if (@is_dir($tpldir))
+                       if (is_dir($tpldir))
                        {
                                return $tpldir;
                        }
-                       elseif (@is_dir($tpldir_default))
+                       elseif (is_dir($tpldir_default))
                        {
                                return $tpldir_default;
                        }