From cefc5f185931c8e7a35082addf69aef0924be50a Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 15 Nov 2013 15:50:22 -0600
Subject: [PATCH] upgrade: fix oops in company info loader task
---
include/class.upgrader.php | 2 +-
include/upgrader/streams/core/61c9d5d7-6de40a4d.task.php | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/class.upgrader.php b/include/class.upgrader.php
index 927f4660d..d04b8f284 100644
--- a/include/class.upgrader.php
+++ b/include/class.upgrader.php
@@ -314,7 +314,7 @@ class StreamUpgrader extends SetupWizard {
function getPendingTask() {
$pending=array();
- if ($task=$this->getTask())
+ if (($task=$this->getTask()) && $task)
return ($task->isFinished()) ? 1 : 0;
return false;
diff --git a/include/upgrader/streams/core/61c9d5d7-6de40a4d.task.php b/include/upgrader/streams/core/61c9d5d7-6de40a4d.task.php
index 70b8c7f14..aae021914 100644
--- a/include/upgrader/streams/core/61c9d5d7-6de40a4d.task.php
+++ b/include/upgrader/streams/core/61c9d5d7-6de40a4d.task.php
@@ -18,4 +18,7 @@ class CompanyFormLoader extends MigrationTask {
}
}
}
+
+return 'CompanyFormLoader';
+
?>
--
GitLab