From 08dc90061883643bb90a09c341d8d179ddbf47fc Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Mon, 2 Jul 2012 19:24:34 -0400
Subject: [PATCH] Fix upgrader
---
include/class.upgrader.php | 2 +-
scp/upgrade.php | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/class.upgrader.php b/include/class.upgrader.php
index 1b490a71d..73c647602 100644
--- a/include/class.upgrader.php
+++ b/include/class.upgrader.php
@@ -36,7 +36,7 @@ class Upgrader extends SetupWizard {
set_time_limit(0);
//Init persistent state of upgrade.
- $this->state = &$_SESSION['ost_upgrader'][$this->getShash()]['state'];
+ $this->state = &$_SESSION['ost_upgrader']['state'];
//Init the task Manager.
if(!isset($_SESSION['ost_upgrader'][$this->getShash()]))
diff --git a/scp/upgrade.php b/scp/upgrade.php
index c441bd5b7..19c9b27c2 100644
--- a/scp/upgrade.php
+++ b/scp/upgrade.php
@@ -29,7 +29,6 @@ if($_POST && $_POST['s'] && !$upgrader->isAborted()) {
$errors['err']='The upgrader does NOT support upgrading from the current vesion!';
elseif($upgrader->check_prereq()) {
$upgrader->setState('upgrade');
- $_SESSION['ost_upgrader'] = null;
} else
$errors['prereq']='Minimum requirements not met!';
break;
--
GitLab