* (bug 2538) Suppress notice on user serialized checks

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 550d99b..ca39446 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -366,6 +366,11 @@ Various bugfixes, small features, and a few experimental things:
 == Changes since 1.5beta1 ==
 * (bug 2531) Changed the interwiki name for sh (Serbocroatian) to
   Srpskohrvatski/Српскохрватски (was Српскохрватски (Srbskohrvatski))
+* Nonzero return code for command-line scripts on wfDebugDieBacktrace()
+* Conversion fix for empty old table in upgrade1_5.php
+* Try reading revisions from master if no result on slave
+* (bug 2538) Suppress notice on user serialized checks
+
 
 === Caveats ===
 

diff --git a/includes/User.php b/includes/User.php
index 5f18a22..0de4090 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -531,7 +531,10 @@ class User {
 
                $passwordCorrect = FALSE;
                $user = $wgMemc->get( $key = "$wgDBname:user:id:$sId" );
-               if( $user->mVersion < MW_USER_VERSION ) $user = false;
+               if( !is_object( $user ) || $user->mVersion < MW_USER_VERSION ) {
+                       # Expire old serialized objects; they may be corrupt.
+                       $user = false;
+               }
                if($makenew = !$user) {
                        wfDebug( "User::loadFromSession() unable to load from memcached\n" );
                        $user = new User();