| Index: trunk/phase3/includes/WikiMap.php |
| — | — | @@ -17,15 +17,14 @@ |
| 18 | 18 | $wgConf->loadFullData(); |
| 19 | 19 | |
| 20 | 20 | list( $major, $minor ) = $wgConf->siteFromDB( $wikiID ); |
| 21 | | - if( isset( $major ) ) { |
| 22 | | - $server = $wgConf->get( 'wgCanonicalServer', $wikiID, $major, |
| 23 | | - array( 'lang' => $minor, 'site' => $major ) ); |
| 24 | | - $path = $wgConf->get( 'wgArticlePath', $wikiID, $major, |
| 25 | | - array( 'lang' => $minor, 'site' => $major ) ); |
| 26 | | - return new WikiReference( $major, $minor, $server, $path ); |
| 27 | | - } else { |
| | 21 | + if( $major === null ) { |
| 28 | 22 | return null; |
| 29 | 23 | } |
| | 24 | + $server = $wgConf->get( 'wgCanonicalServer', $wikiID, $major, |
| | 25 | + array( 'lang' => $minor, 'site' => $major ) ); |
| | 26 | + $path = $wgConf->get( 'wgArticlePath', $wikiID, $major, |
| | 27 | + array( 'lang' => $minor, 'site' => $major ) ); |
| | 28 | + return new WikiReference( $major, $minor, $server, $path ); |
| 30 | 29 | } |
| 31 | 30 | |
| 32 | 31 | /** |