| Index: trunk/phase3/includes/User.php |
| — | — | @@ -2166,11 +2166,13 @@ |
| 2167 | 2167 | $this->mSkin =& Skin::newFromKey( $userSkin ); |
| 2168 | 2168 | wfProfileOut( __METHOD__ ); |
| 2169 | 2169 | } |
| 2170 | | - if ( !$t ) { |
| 2171 | | - global $wgOut; |
| 2172 | | - $t = $wgOut->getTitle(); |
| | 2170 | + if( $t || !$this->mSkin->getTitle() ) { |
| | 2171 | + if ( !$t ) { |
| | 2172 | + global $wgOut; |
| | 2173 | + $t = $wgOut->getTitle(); |
| | 2174 | + } |
| | 2175 | + $this->mSkin->setTitle( $t ); |
| 2173 | 2176 | } |
| 2174 | | - $this->mSkin->setTitle( $t ); |
| 2175 | 2177 | return $this->mSkin; |
| 2176 | 2178 | } |
| 2177 | 2179 | |
| — | — | @@ -3515,4 +3517,4 @@ |
| 3516 | 3518 | return true; |
| 3517 | 3519 | } |
| 3518 | 3520 | |
| 3519 | | -} |
| | 3521 | +} |
| \ No newline at end of file |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -24,6 +24,7 @@ |
| 25 | 25 | /**#@-*/ |
| 26 | 26 | protected $mRevisionId; // The revision ID we're looking at, null if not applicable. |
| 27 | 27 | protected $skinname = 'standard'; |
| | 28 | + protected $mTitle = null; |
| 28 | 29 | |
| 29 | 30 | /** Constructor, call parent constructor */ |
| 30 | 31 | function Skin() { parent::__construct(); } |
| — | — | @@ -283,6 +284,11 @@ |
| 284 | 285 | public function setTitle( $t ) { |
| 285 | 286 | $this->mTitle = $t; |
| 286 | 287 | } |
| | 288 | + |
| | 289 | + /** Get the title */ |
| | 290 | + public function getTitle() { |
| | 291 | + return $this->mTitle; |
| | 292 | + } |
| 287 | 293 | |
| 288 | 294 | function outputPage( OutputPage $out ) { |
| 289 | 295 | global $wgDebugComments; |
| — | — | @@ -1920,4 +1926,4 @@ |
| 1921 | 1927 | wfProfileOut( __METHOD__ ); |
| 1922 | 1928 | return $bar; |
| 1923 | 1929 | } |
| 1924 | | -} |
| | 1930 | +} |
| \ No newline at end of file |