X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fjobqueue%2FJobQueueDB.php;h=056e5a83def8def7d41596be41713c48384b8b06;hb=cba15a69aec2945cea2dc799750858576e015087;hp=1991bb49ff3af9ac36fa8f615f008f759ec98965;hpb=bc4147866e27965ca67bf88aac21c4ccfb061776;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php
index 1991bb49ff..056e5a83de 100644
--- a/includes/jobqueue/JobQueueDB.php
+++ b/includes/jobqueue/JobQueueDB.php
@@ -189,9 +189,9 @@ class JobQueueDB extends JobQueue {
 	/**
 	 * @see JobQueue::doBatchPush()
 	 * @param array $jobs
-	 * @param array $flags
+	 * @param int $flags
 	 * @throws DBError|Exception
-	 * @return bool
+	 * @return void
 	 */
 	protected function doBatchPush( array $jobs, $flags ) {
 		$dbw = $this->getMasterDB();
@@ -203,8 +203,6 @@ class JobQueueDB extends JobQueue {
 				$that->doBatchPushInternal( $dbw, $jobs, $flags, $method );
 			}
 		);
-
-		return true;
 	}
 
 	/**
@@ -215,11 +213,11 @@ class JobQueueDB extends JobQueue {
 	 * @param int $flags
 	 * @param string $method
 	 * @throws DBError
-	 * @return bool
+	 * @return void
 	 */
 	public function doBatchPushInternal( IDatabase $dbw, array $jobs, $flags, $method ) {
 		if ( !count( $jobs ) ) {
-			return true;
+			return;
 		}
 
 		$rowSet = array(); // (sha1 => job) map for jobs that are de-duplicated
@@ -277,7 +275,7 @@ class JobQueueDB extends JobQueue {
 
 		$this->cache->set( $this->getCacheKey( 'empty' ), 'false', JobQueueDB::CACHE_TTL_LONG );
 
-		return true;
+		return;
 	}
 
 	/**
@@ -558,7 +556,7 @@ class JobQueueDB extends JobQueue {
 	 * @return void
 	 */
 	protected function doWaitForBackups() {
-		wfWaitForSlaves();
+		wfWaitForSlaves( false, $this->wiki, $this->cluster ?: false );
 	}
 
 	/**