| Index: branches/wmf/1.17wmf1/includes/User.php |
| — | — | @@ -2255,21 +2255,16 @@ |
| 2256 | 2256 | * @todo FIXME : need to check the old failback system [AV] |
| 2257 | 2257 | */ |
| 2258 | 2258 | function getSkin( $t = null ) { |
| 2259 | | - if ( $t ) { |
| | 2259 | + if( !$this->mSkin ) { |
| | 2260 | + global $wgOut; |
| | 2261 | + $this->mSkin = $this->createSkinObject(); |
| | 2262 | + $this->mSkin->setTitle( $wgOut->getTitle() ); |
| | 2263 | + } |
| | 2264 | + if ( $t && !$t->equals( $this->mSkin->getTitle() ) ) { |
| 2260 | 2265 | $skin = $this->createSkinObject(); |
| 2261 | 2266 | $skin->setTitle( $t ); |
| 2262 | 2267 | return $skin; |
| 2263 | 2268 | } else { |
| 2264 | | - if ( !$this->mSkin ) { |
| 2265 | | - $this->mSkin = $this->createSkinObject(); |
| 2266 | | - } |
| 2267 | | - |
| 2268 | | - if ( !$this->mSkin->getTitle() ) { |
| 2269 | | - global $wgOut; |
| 2270 | | - $t = $wgOut->getTitle(); |
| 2271 | | - $this->mSkin->setTitle($t); |
| 2272 | | - } |
| 2273 | | - |
| 2274 | 2269 | return $this->mSkin; |
| 2275 | 2270 | } |
| 2276 | 2271 | } |
| Property changes on: branches/wmf/1.17wmf1/includes/User.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 2277 | 2272 | Merged /branches/sqlite/includes/User.php:r58211-58321 |
| 2278 | 2273 | Merged /branches/new-installer/phase3/includes/User.php:r43664-66004 |
| 2279 | 2274 | Merged /branches/wmf-deployment/includes/User.php:r53381,60970 |
| 2280 | 2275 | Merged /branches/REL1_15/phase3/includes/User.php:r51646 |
| 2281 | 2276 | Merged /branches/wmf/1.16wmf4/includes/User.php:r67177,69199,76243,77266 |
| 2282 | 2277 | Merged /branches/REL1_17/phase3/includes/User.php:r81684 |