From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Dec 2014 15:41:37 +0100
Subject: Update to MediaWiki 1.24.1

---
 maintenance/showJobs.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'maintenance/showJobs.php')

diff --git a/maintenance/showJobs.php b/maintenance/showJobs.php
index afd7c745..b8dc5548 100644
--- a/maintenance/showJobs.php
+++ b/maintenance/showJobs.php
@@ -38,7 +38,10 @@ class ShowJobs extends Maintenance {
 		parent::__construct();
 		$this->mDescription = "Show number of jobs waiting in master database";
 		$this->addOption( 'group', 'Show number of jobs per job type' );
-		$this->addOption( 'list', 'Show a complete list of all jobs in a machine-readable format, instead of statistics' );
+		$this->addOption(
+			'list',
+			'Show a complete list of all jobs in a machine-readable format, instead of statistics'
+		);
 	}
 
 	public function execute() {
@@ -56,14 +59,16 @@ class ShowJobs extends Maintenance {
 		} elseif ( $this->hasOption( 'group' ) ) {
 			foreach ( $group->getQueueTypes() as $type ) {
 				$queue = $group->get( $type );
+				$delayed = $queue->getDelayedCount();
 				$pending = $queue->getSize();
 				$claimed = $queue->getAcquiredCount();
 				$abandoned = $queue->getAbandonedCount();
 				$active = max( 0, $claimed - $abandoned );
-				if ( ( $pending + $claimed ) > 0 ) {
+				if ( ( $pending + $claimed + $delayed + $abandoned ) > 0 ) {
 					$this->output(
 						"{$type}: $pending queued; " .
-						"$claimed claimed ($active active, $abandoned abandoned)\n"
+						"$claimed claimed ($active active, $abandoned abandoned); " .
+						"$delayed delayed\n"
 					);
 				}
 			}
-- 
cgit v1.2.2