X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fjobqueue%2FJobQueueRedis.php;h=b868128d597da2ec4a333c4ba13239a09cdeab9e;hb=51945dbca3594;hp=e9505bcfb4e55557bc26765053763465c9d11e49;hpb=aef5149bcd5cdf7f11ce73cc32a42be0e426e1b4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/jobqueue/JobQueueRedis.php b/includes/jobqueue/JobQueueRedis.php
index e9505bcfb4..b868128d59 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -776,7 +776,7 @@ LUA;
 	 * @return string JSON
 	 */
 	private function encodeQueueName() {
-		return json_encode( [ $this->type, $this->wiki ] );
+		return json_encode( [ $this->type, $this->domain ] );
 	}
 
 	/**
@@ -809,8 +809,9 @@ LUA;
 	 */
 	private function getQueueKey( $prop, $type = null ) {
 		$type = is_string( $type ) ? $type : $this->type;
-		list( $db, $prefix ) = wfSplitWikiID( $this->wiki );
-		$keyspace = $prefix ? "$db-$prefix" : $db;
+
+		// Use wiki ID for b/c
+		$keyspace = WikiMap::getWikiIdFromDomain( $this->domain );
 
 		$parts = [ $keyspace, 'jobqueue', $type, $prop ];