| Index: trunk/phase3/includes/Wiki.php |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | return; |
| 62 | 62 | } |
| 63 | 63 | if( !$this->initializeSpecialCases( $title, $output, $request ) ) { |
| 64 | | - $new_article = $this->initializeArticle( $title, $request ); |
| | 64 | + $new_article = $this->initializeArticle( $title, $output, $request ); |
| 65 | 65 | if( is_object( $new_article ) ) { |
| 66 | 66 | $article = $new_article; |
| 67 | 67 | $this->performAction( $output, $article, $title, $user, $request ); |
| — | — | @@ -274,10 +274,11 @@ |
| 275 | 275 | * Create an Article object for the page, following redirects if needed. |
| 276 | 276 | * |
| 277 | 277 | * @param $title Title ($wgTitle) |
| 278 | | - * @param $request WebRequest |
| | 278 | + * @param $output OutputPage ($wgOut) |
| | 279 | + * @param $request WebRequest ($wgRequest) |
| 279 | 280 | * @return mixed an Article, or a string to redirect to another URL |
| 280 | 281 | */ |
| 281 | | - function initializeArticle( &$title, $request ) { |
| | 282 | + function initializeArticle( &$title, &$output, $request ) { |
| 282 | 283 | wfProfileIn( __METHOD__ ); |
| 283 | 284 | |
| 284 | 285 | $action = $this->getVal( 'action', 'view' ); |
| — | — | @@ -324,6 +325,7 @@ |
| 325 | 326 | $rarticle->setRedirectedFrom( $title ); |
| 326 | 327 | $article = $rarticle; |
| 327 | 328 | $title = $target; |
| | 329 | + $output->setTitle( $title ); |
| 328 | 330 | } |
| 329 | 331 | } |
| 330 | 332 | } else { |