Merge pull request #6 from Wikia/smw-sync

Backport SUS-1305 and SUS-2180

Author: Máté Szabó

includes/specials/SMW_SpecialSMWAdmin.php

@@ -74,16 +74,18 @@ public function execute( $par ) {
 
 		$this->messageBuilder = $this->htmlFormRenderer->getMessageBuilder();
 
-		$jobQueueLookup = $mwCollaboratorFactory->newJobQueueLookup( $this->getStore()->getConnection( 'mw.db' ) );
-		$row = $jobQueueLookup->selectJobRowFor( 'SMW\RefreshJob' );
-
-		if ( $row !== false ) { // similar to Job::pop_type, but without deleting the job
-			$title = Title::makeTitleSafe( $row->job_namespace, $row->job_title );
-			$blob = (string)$row->job_params !== '' ? unserialize( $row->job_params ) : false;
-			$refreshjob = Job::factory( $row->job_cmd, $title, $blob, $row->job_id );
-		} else {
+		// $jobQueueLookup = $mwCollaboratorFactory->newJobQueueLookup( $this->getStore()
+		//	->getConnection( 'mw.db' ) );
+		// $row = $jobQueueLookup->selectJobRowFor( 'SMW\RefreshJob' );
+
+		// if ( $row !== false ) { // similar to Job::pop_type, but without deleting the job
+		//	$title = Title::makeTitleSafe( $row->job_namespace, $row->job_title );
+		//	$blob = (string)$row->job_params !== '' ? unserialize( $row->job_params ) : false;
+		//	$refreshjob = Job::factory( $row->job_cmd, $title, $blob, $row->job_id );
+		//} else {
+		// Wikia change - we do not use job DB table for handling tasks queue (SUS-1305)
 			$refreshjob = null;
-		}
+		//}
 
 		/**** Execute actions if any ****/
 		switch ( $this->getRequest()->getText( 'action' ) ) {

tests/phpunit/Integration/InterwikiDBIntegrationTest.php

@@ -52,8 +52,6 @@ protected function setUp() {
 			$interwiki = array(
 				'iw_prefix' => 'iw-test',
 				'iw_url' => 'http://www.example.org/$1',
-				'iw_api' => false,
-				'iw_wikiid' => 'foo',
 				'iw_local' => true,
 				'iw_trans' => false,
 			);