| Index: trunk/phase3/RELEASE-NOTES-1.18 |
| — | — | @@ -621,6 +621,8 @@ |
| 622 | 622 | * Removed legacy wgAjaxWatch javascript global object, no longer in use. |
| 623 | 623 | * (bug 28556) Upload support for MacBinary files has been removed (Used by |
| 624 | 624 | Internet Explorer 5 for Mac OS 9) |
| | 625 | +* On wiki farm setups using $wgConf, 'wgCanonicalServer' is now expected to be |
| | 626 | + set for all wikis. This was already the case for 'wgServer'. |
| 625 | 627 | |
| 626 | 628 | == Compatibility == |
| 627 | 629 | |
| Index: trunk/phase3/includes/WikiMap.php |
| — | — | @@ -18,7 +18,7 @@ |
| 19 | 19 | |
| 20 | 20 | list( $major, $minor ) = $wgConf->siteFromDB( $wikiID ); |
| 21 | 21 | if( isset( $major ) ) { |
| 22 | | - $server = $wgConf->get( 'wgServer', $wikiID, $major, |
| | 22 | + $server = $wgConf->get( 'wgCanonicalServer', $wikiID, $major, |
| 23 | 23 | array( 'lang' => $minor, 'site' => $major ) ); |
| 24 | 24 | $path = $wgConf->get( 'wgArticlePath', $wikiID, $major, |
| 25 | 25 | array( 'lang' => $minor, 'site' => $major ) ); |