extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Undo last commit for now to fix bug when selecting idsociety template

Browse Source
This commit is contained in:
Miles Lott 2004-02-03 07:22:42 +00:00
parent 44a584790c
commit 49726e4623
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpgwapi/inc/class.Template.inc.php
View File

@ -362,13 +362,13 @@
*/
function filename($filename,$root='',$time=1)
{
if($root=='')
if($root == '')
{
$root=$this->root;
$root = $this->root;
}
if (substr($filename, 0, 1) != '/')
if(substr($filename, 0, 1) != '/')
{
$new_filename = $root.'/'.$filename;
$new_filename = $root . '/' . $filename;
}
else
{
@ -383,7 +383,8 @@
}
else
{
$new_root = substr($root, 0, strrpos($root, $GLOBALS['phpgw_info']['server']['template_set'])).'default';
// $new_root = substr($root, 0, strrpos($root, $GLOBALS['phpgw_info']['server']['template_set'])).'default';
$new_root = str_replace($GLOBALS['phpgw_info']['server']['template_set'],'default',$root);
$new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2);
}
}