Merge pull request #6828 from owncloud/dont_add_queuedtasks_during_upgrade

add needUpgrade() check to addQueuedTask()
13 years ago · 369ec65d12
parent bc22799160 40c2f47cd9
commit 369ec65d12
1 changed files with 4 additions and 2 deletions
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@ -173,8 +173,10 @@ class BackgroundJob {
 	 * @return int id of task
 	 */
 	public static function addQueuedTask($app, $class, $method, $parameters) {
-		self::registerJob('OC\BackgroundJob\Legacy\QueuedJob', array('app' => $app, 'klass' => $class, 'method' => $method, 'parameters' => $parameters));
-		return true;
+		if (!\OC::needUpgrade()) {
+			self::registerJob('OC\BackgroundJob\Legacy\QueuedJob', array('app' => $app, 'klass' => $class, 'method' => $method, 'parameters' => $parameters));
+			return true;
+		}
 	}

 	/**