diff --git a/setup/inc/class.upgrader.php b/setup/inc/class.upgrader.php index c82ae721f7d4c28cb451ada9a5ba6f753e983149..9e208426fcd9288c9108d847c598ca5112dc6d35 100644 --- a/setup/inc/class.upgrader.php +++ b/setup/inc/class.upgrader.php @@ -201,7 +201,7 @@ class Upgrader extends SetupWizard { //clear previous patch info - - unset($_SESSION['ost_upgrader'][$this->getSHash()]); + unset($_SESSION['ost_upgrader'][$this->getShash()]); //Load up post-upgrade tasks.... if any. $phash = substr(basename($patch), 0, 17); @@ -241,7 +241,7 @@ class Upgrader extends SetupWizard { /************* TASKS **********************/ function cleanup($tId=0) { - $file=$this->getSQLDir().$this->getSHash().'-cleanup.sql'; + $file=$this->getSQLDir().$this->getShash().'-cleanup.sql'; if(!file_exists($file)) //No cleanup script. return 0; diff --git a/setup/p.php b/setup/p.php index ebc4128b3455ac4063425bb9802abc856ff2c0e9..babeebb866f198e7fc78516a34133164d72a9b47 100644 --- a/setup/p.php +++ b/setup/p.php @@ -19,7 +19,7 @@ function staffLoginPage($msg) { } require '../scp/staff.inc.php'; -if(!$thisstaff or !$thisstaff->isadmin()) { +if(!$thisstaff or !$thisstaff->isAdmin()) { staffLoginPage('Admin Access Required!'); exit; } @@ -34,8 +34,8 @@ require_once INC_DIR.'class.upgrader.php'; $upgrader = new Upgrader($cfg->getSchemaSignature(), TABLE_PREFIX, SQL_DIR); //Just report the next action on the first call. -if(!$_SESSION['ost_upgrader'][$upgrader->getSHash()]['progress']) { - $_SESSION['ost_upgrader'][$upgrader->getSHash()]['progress'] = $upgrader->getNextAction(); +if(!$_SESSION['ost_upgrader'][$upgrader->getShash()]['progress']) { + $_SESSION['ost_upgrader'][$upgrader->getShash()]['progress'] = $upgrader->getNextAction(); Http::response(200, $upgrader->getNextAction()); exit; } diff --git a/setup/upgrade.php b/setup/upgrade.php index 324c467efd72d887b7592af33f6ba201c6f26e22..0406383707cfe245fd11aae9323ee1422d6d679e 100644 --- a/setup/upgrade.php +++ b/setup/upgrade.php @@ -22,7 +22,7 @@ function staffLoginPage($msg) { } require '../scp/staff.inc.php'; -if(!$thisstaff or !$thisstaff->isadmin()) { +if(!$thisstaff or !$thisstaff->isAdmin()) { staffLoginPage('Admin Access Required!'); exit; }