From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sat, 30 Mar 2019 03:44:56 +0000 (-0700)
Subject: Do not return invalid JSON in runJobs.php
X-Git-Tag: 1.34.0-rc.0~2222^2
X-Git-Url: http://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=ae3559f83fadee0e5139bb5688483e64782958b9;p=lhc%2Fweb%2Fwiklou.git

Do not return invalid JSON in runJobs.php

Change-Id: Ib94c23bfc5e599a628a5fd65bb14baf750874995
---

diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index 9f5f1afd23..802a114fca 100644
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -100,7 +100,7 @@ class RunJobs extends Maintenance {
 				$response['reached'] === 'memory-limit'
 			) {
 				// If job queue is empty, output it
-				if ( $response['jobs'] === [] ) {
+				if ( !$outputJSON && $response['jobs'] === [] ) {
 					$this->output( "Job queue is empty.\n" );
 				}
 				break;