Fix for r81675: Skin::getTitle() will return null when $wgTitle is null and $wgOut...

Catchable fatal error: Argument 1 passed to Title::equals() must be an instance of Title, null given, called in includes/User.php on line 2255 and defined in includes/Title.php on line 3689

diff --git a/includes/User.php b/includes/User.php
index 46d6f42..90875cb 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -2255,7 +2255,7 @@ class User {
                        $this->mSkin = $this->createSkinObject();
                        $this->mSkin->setTitle( $wgOut->getTitle() );
                }
-               if ( $t && !$t->equals( $this->mSkin->getTitle() ) ) {
+               if ( $t && ( !$this->mSkin->getTitle() || !$t->equals( $this->mSkin->getTitle() ) ) ) {
                        $skin = $this->createSkinObject();
                        $skin->setTitle( $t );
                        return $skin;