X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fjobqueue%2FJobQueue.php;h=3a8bf1ab8a7db2077dd62597dfb718cf0c7f353c;hp=d20a233ee2ddb7fa203d5fbf57b8b1c69cab969b;hb=a7e147b7ee64830788a67779e2d8137017c0e919;hpb=203cedd029e42bd3c55e50a9cff6f14373d8aa67

diff --git a/includes/jobqueue/JobQueue.php b/includes/jobqueue/JobQueue.php
index d20a233ee2..3a8bf1ab8a 100644
--- a/includes/jobqueue/JobQueue.php
+++ b/includes/jobqueue/JobQueue.php
@@ -362,7 +362,7 @@ abstract class JobQueue {
 		global $wgJobClasses;
 
 		$this->assertNotReadOnly();
-		if ( $this->wiki !== wfWikiID() ) {
+		if ( !WikiMap::isCurrentWikiDbDomain( $this->wiki ) ) {
 			throw new MWException( "Cannot pop '{$this->type}' job off foreign wiki queue." );
 		} elseif ( !isset( $wgJobClasses[$this->type] ) ) {
 			// Do not pop jobs if there is no class for the queue type
@@ -378,7 +378,7 @@ abstract class JobQueue {
 		// Flag this job as an old duplicate based on its "root" job...
 		try {
 			if ( $job && $this->isRootJobOldDuplicate( $job ) ) {
-				JobQueue::incrStats( 'dupe_pops', $this->type );
+				self::incrStats( 'dupe_pops', $this->type );
 				$job = DuplicateJob::newFromJob( $job ); // convert to a no-op
 			}
 		} catch ( Exception $e ) {