| Index: trunk/extensions/SiteMatrix/SiteMatrixApi.php |
| — | — | @@ -57,7 +57,7 @@ |
| 58 | 58 | |
| 59 | 59 | $url = $matrix->getUrl( $lang, $site ); |
| 60 | 60 | $site_out = array( |
| 61 | | - 'url' => wfExpandUrl( $url ), |
| | 61 | + 'url' => $url, |
| 62 | 62 | 'dbname' => $matrix->getDBName( $lang, $site ), |
| 63 | 63 | 'code' => $site, |
| 64 | 64 | ); |
| — | — | @@ -91,7 +91,7 @@ |
| 92 | 92 | $url = $matrix->getUrl( $lang, $site ); |
| 93 | 93 | |
| 94 | 94 | $wiki = array(); |
| 95 | | - $wiki['url'] = wfExpandUrl( $url ); |
| | 95 | + $wiki['url'] = $url; |
| 96 | 96 | $wiki['dbname'] = $matrix->getDBName( $lang, $site ); |
| 97 | 97 | $wiki['code'] = str_replace( '_', '-', $lang ) . ( $site != 'wiki' ? $site : '' ); |
| 98 | 98 | |
| Index: trunk/extensions/SiteMatrix/SiteMatrix_body.php |
| — | — | @@ -135,7 +135,7 @@ |
| 136 | 136 | global $wgConf; |
| 137 | 137 | $dbname = $this->getDBName( $minor, $major ); |
| 138 | 138 | $minor = str_replace( '_', '-', $minor ); |
| 139 | | - return $wgConf->get( 'wgServer', $dbname, $major, |
| | 139 | + return $wgConf->get( 'wgCanonicalServer', $dbname, $major, |
| 140 | 140 | array( 'lang' => $minor, 'site' => $major ) ); |
| 141 | 141 | } |
| 142 | 142 | |
| Index: trunk/extensions/CentralAuth/ApiQueryGlobalUserInfo.php |
| — | — | @@ -82,7 +82,7 @@ |
| 83 | 83 | |
| 84 | 84 | $a = array( |
| 85 | 85 | 'wiki' => $dbname, |
| 86 | | - 'url' => wfExpandUrl( $this->getUrl( $dbname ) ), |
| | 86 | + 'url' => $this->getUrl( $dbname ), |
| 87 | 87 | 'timestamp' => wfTimestamp( TS_ISO_8601, $account['attachedTimestamp'] ), |
| 88 | 88 | 'method' => $account['attachedMethod'], |
| 89 | 89 | 'editcount' => $account['editCount'] |
| — | — | @@ -121,7 +121,7 @@ |
| 122 | 122 | |
| 123 | 123 | list( $major, $minor ) = $wgConf->siteFromDB( $dbname ); |
| 124 | 124 | $minor = str_replace( '_', '-', $minor ); |
| 125 | | - return $wgConf->get( 'wgServer', $dbname, $major, |
| | 125 | + return $wgConf->get( 'wgCanonicalServer', $dbname, $major, |
| 126 | 126 | array( 'lang' => $minor, 'site' => $major ) ); |
| 127 | 127 | } |
| 128 | 128 | |
| Index: trunk/extensions/CentralAuth/CentralAuthUser.php |
| — | — | @@ -1188,8 +1188,7 @@ |
| 1189 | 1189 | protected static function getIRCLine( $userpage, $wikiID ) { |
| 1190 | 1190 | $title = RecentChange::cleanupForIRC( $userpage->getPrefixedText() ); |
| 1191 | 1191 | $wikiID = RecentChange::cleanupForIRC( $wikiID ); |
| 1192 | | - // FIXME: *HACK* should be getFullURL(), hacked for SSL madness |
| 1193 | | - $url = $userpage->getInternalURL(); |
| | 1192 | + $url = $userpage->getCanonicalURL(); |
| 1194 | 1193 | $user = RecentChange::cleanupForIRC( $userpage->getText() ); |
| 1195 | 1194 | # see http://www.irssi.org/documentation/formats for some colour codes. prefix is \003, |
| 1196 | 1195 | # no colour (\003) switches back to the term default |