[Phpgroupware-cvs] phpgwapi/inc class.Template.inc.php,1.36

[ceb]

Update of phpgwapi/inc

Modified Files:
     Branch: MAIN
            class.Template.inc.php lines: +5 -3

Log Message:
applied patch

====================================================
Index: phpgwapi/inc/class.Template.inc.php
diff -u phpgwapi/inc/class.Template.inc.php:1.35 
phpgwapi/inc/class.Template.inc.php:1.36
--- phpgwapi/inc/class.Template.inc.php:1.35    Tue Jan 11 13:39:47 2005
+++ phpgwapi/inc/class.Template.inc.php Sat Apr 23 21:44:58 2005
@@ -4,7 +4,7 @@
        * @author Kristian Koehntopp
        * @author Dan Kuykendall
        * @copyright Copyright (C) 1999,2000 NetUSE GmbH Kristian Koehntopp
-       * @copyright Portions Copyright (C) 2001-2004 Free Software Foundation, 
Inc. http://www.fsf.org/
+       * @copyright Portions Copyright (C) 2001-2005 Free Software Foundation, 
Inc. http://www.fsf.org/
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage gui
@@ -386,7 +386,9 @@
                                }
                                else
                                {
-                                       $new_root = 
str_replace($GLOBALS['phpgw_info']['server']['template_set'],'base',$root);
+                                       //$new_root = 
str_replace($GLOBALS['phpgw_info']['server']['template_set'],'base',$root);
+                                       $new_root = 
ereg_replace($GLOBALS['phpgw_info']['server']['template_set'].'$','base',$root);
+
                                        $new_filename = 
$this->filename(str_replace($root.'/','',$new_filename),$new_root,2);
                                }
                        }