holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use $GLOBALS

Browse Source
This commit is contained in:
Miles Lott 2001-08-23 06:48:27 +00:00
parent 57ba2dfff8
commit 73dfa28bdf
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -357,7 +357,6 @@
*/ */
function filename($filename,$root='',$time=1) function filename($filename,$root='',$time=1)
{ {
global $phpgw_info;
if($root=='') if($root=='')
{ {
$root=$this->root; $root=$this->root;
@ -379,7 +378,7 @@
} }
else else
{ {
$new_root = str_replace($phpgw_info['server']['template_set'],'default',$root); $new_root = str_replace($GLOBALS['phpgw_info']['server']['template_set'],'default',$root);
$new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2); $new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2);
} }
} }
@ -427,8 +426,6 @@
*/ */
function halt($msg) function halt($msg)
{ {
global $phpgw;
$this->last_error = $msg; $this->last_error = $msg;
if ($this->halt_on_error != 'no') if ($this->halt_on_error != 'no')
@ -441,7 +438,7 @@
echo('<b>Halted.</b>'); echo('<b>Halted.</b>');
} }
$phpgw->common->phpgw_exit(True); $GLOBALS['phpgw']->common->phpgw_exit(True);
} }
/* public, override: haltmsg($msg) /* public, override: haltmsg($msg)