| Index: branches/wmf/1.16wmf4/includes/Article.php |
| — | — | @@ -799,15 +799,6 @@ |
| 800 | 800 | wfIncrStats( 'pcache_miss_stub' ); |
| 801 | 801 | } |
| 802 | 802 | |
| 803 | | - # For the main page, overwrite the <title> element with the con- |
| 804 | | - # tents of 'pagetitle-view-mainpage' instead of the default (if |
| 805 | | - # that's not empty). |
| 806 | | - if ( $this->mTitle->equals( Title::newMainPage() ) |
| 807 | | - && ( $m = wfMsgForContent( 'pagetitle-view-mainpage' ) ) !== '' ) |
| 808 | | - { |
| 809 | | - $wgOut->setHTMLTitle( $m ); |
| 810 | | - } |
| 811 | | - |
| 812 | 803 | $wasRedirected = $this->showRedirectedFromHeader(); |
| 813 | 804 | $this->showNamespaceHeader(); |
| 814 | 805 | |
| — | — | @@ -932,6 +923,15 @@ |
| 933 | 924 | } |
| 934 | 925 | } |
| 935 | 926 | |
| | 927 | + # For the main page, overwrite the <title> element with the con- |
| | 928 | + # tents of 'pagetitle-view-mainpage' instead of the default (if |
| | 929 | + # that's not empty). |
| | 930 | + if ( $this->mTitle->equals( Title::newMainPage() ) |
| | 931 | + && ( $m = wfMsgForContent( 'pagetitle-view-mainpage' ) ) !== '' ) |
| | 932 | + { |
| | 933 | + $wgOut->setHTMLTitle( $m ); |
| | 934 | + } |
| | 935 | + |
| 936 | 936 | # Now that we've filled $this->mParserOutput, we know whether |
| 937 | 937 | # there are any __NOINDEX__ tags on the page |
| 938 | 938 | $policy = $this->getRobotPolicy( 'view' ); |
| Property changes on: branches/wmf/1.16wmf4/includes/Article.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 939 | 939 | Merged /branches/sqlite/includes/Article.php:r58211-58321 |
| 940 | 940 | Merged /trunk/phase3/includes/Article.php:r63549,63764,63897-63901,64934 |
| 941 | 941 | Merged /branches/wmf-deployment/includes/Article.php:r53381,60970 |
| 942 | 942 | Merged /branches/REL1_15/phase3/includes/Article.php:r51646 |