r85298 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r85297‎ | r85298 | r85299 >
Date:23:47, 3 April 2011
Author:dantman
Status:ok
Tags:
Comment:
Remove $this->context->output->setTitle( $this->context->title ); calls from Wiki.php, this are unnecessary, OutputPage no longer keeps track of it's own desynchronized mTitle.
Modified paths:
  • /trunk/phase3/includes/Wiki.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Wiki.php
@@ -73,7 +73,6 @@
7474 public function performRequestForTitle( &$article, &$user ) {
7575 wfProfileIn( __METHOD__ );
7676
77 - $this->context->output->setTitle( $this->context->title );
7877 if ( $this->context->request->getVal( 'printable' ) === 'yes' ) {
7978 $this->context->output->setPrintable();
8079 }
@@ -184,7 +183,6 @@
185184 // Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty.
186185 if ( is_null( $this->context->title ) || ( ( $this->context->title->getDBkey() == '' ) && ( $this->context->title->getInterwiki() == '' ) ) ) {
187186 $this->context->title = SpecialPage::getTitleFor( 'Badtitle' );
188 - $this->context->output->setTitle( $this->context->title ); // bug 21456
189187 // Die now before we mess up $wgArticle and the skin stops working
190188 throw new ErrorPageError( 'badtitle', 'badtitletext' );
191189
@@ -204,7 +202,6 @@
205203 $this->context->output->redirect( $url, 301 );
206204 } else {
207205 $this->context->title = SpecialPage::getTitleFor( 'Badtitle' );
208 - $this->context->output->setTitle( $this->context->title ); // bug 21456
209206 wfProfileOut( __METHOD__ );
210207 throw new ErrorPageError( 'badtitle', 'badtitletext' );
211208 }
@@ -377,7 +374,6 @@
378375 $rarticle->setRedirectedFrom( $this->context->title );
379376 $article = $rarticle;
380377 $this->context->title = $target;
381 - $this->context->output->setTitle( $this->context->title );
382378 }
383379 }
384380 } else {

Status & tagging log