| Index: trunk/phase3/includes/User.php |
| — | — | @@ -282,7 +282,7 @@ |
| 283 | 283 | # Try cache |
| 284 | 284 | $key = wfMemcKey( 'user', 'id', $this->mId ); |
| 285 | 285 | $data = $wgMemc->get( $key ); |
| 286 | | - if ( !is_array( $data ) || $data['mVersion'] < 'MW_USER_VERSION' ) { |
| | 286 | + if ( !is_array( $data ) || $data['mVersion'] < MW_USER_VERSION ) { |
| 287 | 287 | # Object is expired, load from DB |
| 288 | 288 | $data = false; |
| 289 | 289 | } |
| — | — | @@ -972,7 +972,7 @@ |
| 973 | 973 | $this->mSkin = null; |
| 974 | 974 | $this->mRights = null; |
| 975 | 975 | $this->mEffectiveGroups = null; |
| 976 | | - $this->mOptions = array(); |
| | 976 | + $this->mOptions = null; |
| 977 | 977 | |
| 978 | 978 | if ( $reloadFrom ) { |
| 979 | 979 | $this->mDataLoaded = false; |