| Index: trunk/phase3/maintenance/generateSitemap.php |
| — | — | @@ -298,7 +298,7 @@ |
| 299 | 299 | } |
| 300 | 300 | $title = Title::makeTitle( $row->page_namespace, $row->page_title ); |
| 301 | 301 | $date = wfTimestamp( TS_ISO_8601, $row->page_touched ); |
| 302 | | - $entry = $this->fileEntry( $title->getFullURL(), $date, $this->priority( $namespace ) ); |
| | 302 | + $entry = $this->fileEntry( $title->getCanonicalURL(), $date, $this->priority( $namespace ) ); |
| 303 | 303 | $length += strlen( $entry ); |
| 304 | 304 | $this->write( $this->file, $entry ); |
| 305 | 305 | // generate pages for language variants |
| — | — | @@ -306,7 +306,7 @@ |
| 307 | 307 | $variants = $wgContLang->getVariants(); |
| 308 | 308 | foreach ( $variants as $vCode ) { |
| 309 | 309 | if ( $vCode == $wgContLang->getCode() ) continue; // we don't want default variant |
| 310 | | - $entry = $this->fileEntry( $title->getFullURL( '', $vCode ), $date, $this->priority( $namespace ) ); |
| | 310 | + $entry = $this->fileEntry( $title->getCanonicalURL( '', $vCode ), $date, $this->priority( $namespace ) ); |
| 311 | 311 | $length += strlen( $entry ); |
| 312 | 312 | $this->write( $this->file, $entry ); |
| 313 | 313 | } |
| — | — | @@ -456,7 +456,7 @@ |
| 457 | 457 | |
| 458 | 458 | $this->limit = array( |
| 459 | 459 | strlen( $this->openFile() ), |
| 460 | | - strlen( $this->fileEntry( $title->getFullUrl(), wfTimestamp( TS_ISO_8601, wfTimestamp() ), $this->priority( $namespace ) ) ), |
| | 460 | + strlen( $this->fileEntry( $title->getCanonicalURL(), wfTimestamp( TS_ISO_8601, wfTimestamp() ), $this->priority( $namespace ) ) ), |
| 461 | 461 | strlen( $this->closeFile() ) |
| 462 | 462 | ); |
| 463 | 463 | } |
| Index: trunk/phase3/includes/diff/DifferenceEngine.php |
| — | — | @@ -190,14 +190,14 @@ |
| 191 | 191 | # we'll use the application/x-external-editor interface to call |
| 192 | 192 | # an external diff tool like kompare, kdiff3, etc. |
| 193 | 193 | if ( $wgUseExternalEditor && $wgUser->getOption( 'externaldiff' ) ) { |
| 194 | | - global $wgServer, $wgScript, $wgLang; |
| | 194 | + global $wgCanonicalServer, $wgScript, $wgLang; |
| 195 | 195 | $wgOut->disable(); |
| 196 | 196 | header ( "Content-type: application/x-external-editor; charset=UTF-8" ); |
| 197 | | - $url1 = $this->mTitle->getFullURL( array( |
| | 197 | + $url1 = $this->mTitle->getCanonical( array( |
| 198 | 198 | 'action' => 'raw', |
| 199 | 199 | 'oldid' => $this->mOldid |
| 200 | 200 | ) ); |
| 201 | | - $url2 = $this->mTitle->getFullURL( array( |
| | 201 | + $url2 = $this->mTitle->getCanonical( array( |
| 202 | 202 | 'action' => 'raw', |
| 203 | 203 | 'oldid' => $this->mNewid |
| 204 | 204 | ) ); |
| — | — | @@ -206,7 +206,7 @@ |
| 207 | 207 | [Process] |
| 208 | 208 | Type=Diff text |
| 209 | 209 | Engine=MediaWiki |
| 210 | | - Script={$wgServer}{$wgScript} |
| | 210 | + Script={$wgCanonicalServer}{$wgScript} |
| 211 | 211 | Special namespace={$special} |
| 212 | 212 | |
| 213 | 213 | [File] |
| Index: trunk/phase3/includes/ExternalEdit.php |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | * Output the information for the external editor |
| 47 | 47 | */ |
| 48 | 48 | public function edit() { |
| 49 | | - global $wgOut, $wgScript, $wgScriptPath, $wgServer, $wgLang; |
| | 49 | + global $wgOut, $wgScript, $wgScriptPath, $wgCanonicalServer, $wgLang; |
| 50 | 50 | $wgOut->disable(); |
| 51 | 51 | header( 'Content-type: application/x-external-editor; charset=utf-8' ); |
| 52 | 52 | header( 'Cache-control: no-cache' ); |
| — | — | @@ -56,11 +56,11 @@ |
| 57 | 57 | if( $this->mode == "file" ) { |
| 58 | 58 | $type = "Edit file"; |
| 59 | 59 | $image = wfLocalFile( $this->title ); |
| 60 | | - $url = $image->getFullURL(); |
| | 60 | + $url = $image->getCanonicalURL(); |
| 61 | 61 | $extension = $image->getExtension(); |
| 62 | 62 | } else { |
| 63 | 63 | $type = "Edit text"; |
| 64 | | - $url = $this->title->getFullURL( |
| | 64 | + $url = $this->title->getCanonicalURL( |
| 65 | 65 | array( 'action' => 'edit', 'internaledit' => 'true' ) ); |
| 66 | 66 | # *.wiki file extension is used by some editors for syntax |
| 67 | 67 | # highlighting, so we follow that convention |
| — | — | @@ -76,8 +76,8 @@ |
| 77 | 77 | [Process] |
| 78 | 78 | Type=$type |
| 79 | 79 | Engine=MediaWiki |
| 80 | | -Script={$wgServer}{$wgScript} |
| 81 | | -Server={$wgServer} |
| | 80 | +Script={$wgCanonicalServer}{$wgScript} |
| | 81 | +Server={$wgCanonicalServer} |
| 82 | 82 | Path={$wgScriptPath} |
| 83 | 83 | Special namespace=$special |
| 84 | 84 | |