http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65394
Revision: 65394
Author: tstarling
Date: 2010-04-21 14:54:48 +0000 (Wed, 21 Apr 2010)
Log Message:
-----------
MFT r64934: fix total breakage of pagetitle-view-mainpage on language converter
wikis
Modified Paths:
--------------
branches/wmf/1.16wmf4/includes/Article.php
Property Changed:
----------------
branches/wmf/1.16wmf4/includes/Article.php
Modified: branches/wmf/1.16wmf4/includes/Article.php
===================================================================
--- branches/wmf/1.16wmf4/includes/Article.php 2010-04-21 14:51:15 UTC (rev
65393)
+++ branches/wmf/1.16wmf4/includes/Article.php 2010-04-21 14:54:48 UTC (rev
65394)
@@ -799,15 +799,6 @@
wfIncrStats( 'pcache_miss_stub' );
}
- # For the main page, overwrite the <title> element with the con-
- # tents of 'pagetitle-view-mainpage' instead of the default (if
- # that's not empty).
- if ( $this->mTitle->equals( Title::newMainPage() )
- && ( $m = wfMsgForContent( 'pagetitle-view-mainpage' )
) !== '' )
- {
- $wgOut->setHTMLTitle( $m );
- }
-
$wasRedirected = $this->showRedirectedFromHeader();
$this->showNamespaceHeader();
@@ -932,6 +923,15 @@
}
}
+ # For the main page, overwrite the <title> element with the con-
+ # tents of 'pagetitle-view-mainpage' instead of the default (if
+ # that's not empty).
+ if ( $this->mTitle->equals( Title::newMainPage() )
+ && ( $m = wfMsgForContent( 'pagetitle-view-mainpage' )
) !== '' )
+ {
+ $wgOut->setHTMLTitle( $m );
+ }
+
# Now that we've filled $this->mParserOutput, we know whether
# there are any __NOINDEX__ tags on the page
$policy = $this->getRobotPolicy( 'view' );
Property changes on: branches/wmf/1.16wmf4/includes/Article.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/includes/Article.php:51646
/branches/sqlite/includes/Article.php:58211-58321
/branches/wmf-deployment/includes/Article.php:53381,60970
/trunk/phase3/includes/Article.php:63549,63764,63897-63901,64934
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
