| Index: branches/wmf/1.17wmf1/includes/User.php |
| — | — | @@ -2260,7 +2260,7 @@ |
| 2261 | 2261 | $this->mSkin = $this->createSkinObject(); |
| 2262 | 2262 | $this->mSkin->setTitle( $wgOut->getTitle() ); |
| 2263 | 2263 | } |
| 2264 | | - if ( $t && !$t->equals( $this->mSkin->getTitle() ) ) { |
| | 2264 | + if ( $t && ( !$this->mSkin->getTitle() || !$t->equals( $this->mSkin->getTitle() ) ) ) { |
| 2265 | 2265 | $skin = $this->createSkinObject(); |
| 2266 | 2266 | $skin->setTitle( $t ); |
| 2267 | 2267 | return $skin; |
| Property changes on: branches/wmf/1.17wmf1/includes/User.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2268 | 2268 | Merged /trunk/phase3/includes/User.php:r81827 |