diff --git a/bootstrap.php b/bootstrap.php index d5e15e6802fbba4f24bf70b1ec4c6eaa1874f840..93f1161c0b64a61bc5b956054b297e4733281c6e 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -2,7 +2,7 @@ class Bootstrap { - function init() { + static function init() { #Disable Globals if enabled....before loading config info if(ini_get('register_globals')) { ini_set('register_globals',0); diff --git a/include/class.osticket.php b/include/class.osticket.php index 875dc13bf8e2e6217a881db22448c0251a019cc5..41fe2f20d58abb1efee0c52c2369c2fcb45388fb 100644 --- a/include/class.osticket.php +++ b/include/class.osticket.php @@ -362,8 +362,7 @@ class osTicket { return null; } - /* static */ - function get_root_path($dir) { + static function get_root_path($dir) { /* If run from the commandline, DOCUMENT_ROOT will not be set. It is * also likely that the ROOT_PATH will not be necessary, so don't @@ -394,7 +393,8 @@ class osTicket { * the osTicket installation. That is removed from SCRIPT_NAME. * What's left is the ROOT_PATH. */ - $frame = array_pop(debug_backtrace(false)); + $bt = debug_backtrace(false); + $frame = array_pop($bt); $file = str_replace('\\','/', $frame['file']); $path = substr($file, strlen(ROOT_DIR)); if($path && ($pos=strpos($_SERVER['SCRIPT_NAME'], $path))!==false)