| Index: branches/wmf/1.18wmf1/maintenance/dumpInterwiki.php |
| — | — | @@ -83,7 +83,7 @@ |
| 84 | 84 | |
| 85 | 85 | # Site overrides for wikis whose DB names end in 'wiki' but that really belong to another site |
| 86 | 86 | $siteOverrides = array( |
| 87 | | - 'sourceswiki' => 'wikisource', |
| | 87 | + 'sourceswiki' => array( 'wikisource', 'en' ), |
| 88 | 88 | ); |
| 89 | 89 | |
| 90 | 90 | # Extra interwiki links that can't be in the intermap for some reason |
| — | — | @@ -174,7 +174,8 @@ |
| 175 | 175 | # Find out which site this DB belongs to |
| 176 | 176 | $site = false; |
| 177 | 177 | if ( isset( $siteOverrides[$db] ) ) { |
| 178 | | - $site = $sites[$siteOverrides[$db]]; |
| | 178 | + list( $site, $lang ) = $siteOverrides[$db]; |
| | 179 | + $site = $sites[$site]; |
| 179 | 180 | } else { |
| 180 | 181 | foreach ( $sites as $candidateSite ) { |
| 181 | 182 | $suffix = $candidateSite->suffix; |
| — | — | @@ -183,6 +184,7 @@ |
| 184 | 185 | break; |
| 185 | 186 | } |
| 186 | 187 | } |
| | 188 | + $lang = $matches[1]; |
| 187 | 189 | } |
| 188 | 190 | |
| 189 | 191 | $this->makeLink( array( 'iw_prefix' => $db, 'iw_url' => $site->suffix ), "__sites" ); |
| — | — | @@ -190,7 +192,6 @@ |
| 191 | 193 | $this->error( "Invalid database $db\n" ); |
| 192 | 194 | continue; |
| 193 | 195 | } |
| 194 | | - $lang = $matches[1]; |
| 195 | 196 | |
| 196 | 197 | # Lateral links |
| 197 | 198 | foreach ( $sites as $targetSite ) { |
| Property changes on: branches/wmf/1.18wmf1/maintenance/dumpInterwiki.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 198 | 199 | Merged /trunk/extensions/WikimediaMaintenance/dumpInterwiki.php:r102545 |