forked from extern/egroupware
Defined the ->log in CreateObject() as a global, and moved the Actual CreateObject() for the log class to the very beginning of the class CreateObject list.
This commit is contained in:
parent
076bb37660
commit
f942605e30
@ -48,9 +48,9 @@
|
|||||||
{
|
{
|
||||||
global $phpgw_info, $phpgw;
|
global $phpgw_info, $phpgw;
|
||||||
|
|
||||||
if (is_object($phpgw->log) && $class != 'phpgwapi.error' && $class != 'phpgwapi.errorlog')
|
if (is_object(@$GLOBALS['phpgw']->log) && $class != 'phpgwapi.error' && $class != 'phpgwapi.errorlog')
|
||||||
{
|
{
|
||||||
//$phpgw->log->write(array('text'=>'D-Debug, dbg: %1','p1'=>'This class was run: '.$class,'file'=>__FILE__,'line'=>__LINE__));
|
//$GLOBALS['phpgw']->log->write(array('text'=>'D-Debug, dbg: %1','p1'=>'This class was run: '.$class,'file'=>__FILE__,'line'=>__LINE__));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* error_reporting(0); */
|
/* error_reporting(0); */
|
||||||
@ -470,6 +470,7 @@
|
|||||||
/************************************************************************\
|
/************************************************************************\
|
||||||
* Required classes *
|
* Required classes *
|
||||||
\************************************************************************/
|
\************************************************************************/
|
||||||
|
$GLOBALS['phpgw']->log = CreateObject('phpgwapi.errorlog');
|
||||||
$GLOBALS['phpgw']->common = CreateObject('phpgwapi.common');
|
$GLOBALS['phpgw']->common = CreateObject('phpgwapi.common');
|
||||||
$GLOBALS['phpgw']->hooks = CreateObject('phpgwapi.hooks');
|
$GLOBALS['phpgw']->hooks = CreateObject('phpgwapi.hooks');
|
||||||
$GLOBALS['phpgw']->auth = CreateObject('phpgwapi.auth');
|
$GLOBALS['phpgw']->auth = CreateObject('phpgwapi.auth');
|
||||||
@ -479,7 +480,6 @@
|
|||||||
$GLOBALS['phpgw']->preferences = CreateObject('phpgwapi.preferences');
|
$GLOBALS['phpgw']->preferences = CreateObject('phpgwapi.preferences');
|
||||||
$GLOBALS['phpgw']->applications = CreateObject('phpgwapi.applications');
|
$GLOBALS['phpgw']->applications = CreateObject('phpgwapi.applications');
|
||||||
$GLOBALS['phpgw']->translation = CreateObject('phpgwapi.translation');
|
$GLOBALS['phpgw']->translation = CreateObject('phpgwapi.translation');
|
||||||
$GLOBALS['phpgw']->log = CreateObject('phpgwapi.errorlog');
|
|
||||||
// $GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');
|
// $GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');
|
||||||
print_debug('main class loaded');
|
print_debug('main class loaded');
|
||||||
if (! isset($phpgw_info['flags']['included_classes']['error']) ||
|
if (! isset($phpgw_info['flags']['included_classes']['error']) ||
|
||||||
|
Loading…
Reference in New Issue
Block a user