r110455 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r110454‎ | r110455 | r110456 >
Date:01:11, 1 February 2012
Author:reedy
Status:ok
Tags:
Comment:
Revert out part of r109618, after r110454
Modified paths:
  • /branches/wmf/1.18wmf1/maintenance/dumpInterwiki.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/maintenance/dumpInterwiki.php
@@ -187,7 +187,7 @@
188188 $lang = $matches[1];
189189 }
190190
191 - $this->makeLink( array( 'iw_prefix' => $db, 'iw_url' => $site->suffix, 'iw_local' => 1 ), "__sites" );
 191+ $this->makeLink( array( 'iw_prefix' => $db, 'iw_url' => $site->suffix ), "__sites" );
192192 if ( !$site ) {
193193 $this->error( "Invalid database $db\n" );
194194 continue;
@@ -215,8 +215,6 @@
216216 }
217217 }
218218
219 - # ------------------------------------------------------------------------------------------
220 -
221219 # Executes part of an INSERT statement, corresponding to all interlanguage links to a particular site
222220 function makeLanguageLinks( &$site, $source ) {
223221 # Actual languages with their own databases
@@ -242,12 +240,7 @@
243241 array_key_exists( $entry['iw_prefix'], $this->prefixRewrites[$source] ) ) {
244242 $entry['iw_prefix'] = $this->prefixRewrites[$source][$entry['iw_prefix']];
245243 }
246 - if ( !array_key_exists( "iw_local", $entry ) ) {
247 - $entry["iw_local"] = 0;
248 - }
249 - if ( !array_key_exists( "iw_url", $entry ) ) {
250 - return;
251 - }
 244+
252245 if ( $this->dbFile ) {
253246 $this->dbFile->set( "{$source}:{$entry['iw_prefix']}", trim( "{$entry['iw_local']} {$entry['iw_url']}" ) );
254247 } else {

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r109618Some fixes from r109617 brought inreedy14:39, 20 January 2012
r110454Revert part of r109617...reedy01:09, 1 February 2012

Status & tagging log