| Index: trunk/phase3/includes/User.php |
| — | — | @@ -827,7 +827,7 @@ |
| 828 | 828 | $this->mOptionOverrides = null; |
| 829 | 829 | $this->mOptionsLoaded = false; |
| 830 | 830 | |
| 831 | | - if( $wgRequest->getCookie( 'LoggedOut' ) ) { |
| | 831 | + if( $wgRequest->getCookie( 'LoggedOut' ) !== null ) { |
| 832 | 832 | $this->mTouched = wfTimestamp( TS_MW, $wgRequest->getCookie( 'LoggedOut' ) ); |
| 833 | 833 | } else { |
| 834 | 834 | $this->mTouched = '0'; # Allow any pages to be cached |
| — | — | @@ -875,7 +875,7 @@ |
| 876 | 876 | } |
| 877 | 877 | } |
| 878 | 878 | |
| 879 | | - if ( $wgRequest->getCookie( 'UserID' ) ) { |
| | 879 | + if ( $wgRequest->getCookie( 'UserID' ) !== null ) { |
| 880 | 880 | $sId = intval( $wgRequest->getCookie( 'UserID' ) ); |
| 881 | 881 | if( isset( $_SESSION['wsUserID'] ) && $sId != $_SESSION['wsUserID'] ) { |
| 882 | 882 | $this->loadDefaults(); // Possible collision! |
| — | — | @@ -898,7 +898,7 @@ |
| 899 | 899 | |
| 900 | 900 | if ( isset( $_SESSION['wsUserName'] ) ) { |
| 901 | 901 | $sName = $_SESSION['wsUserName']; |
| 902 | | - } else if ( $wgRequest->getCookie('UserName') ) { |
| | 902 | + } else if ( $wgRequest->getCookie('UserName') !== null ) { |
| 903 | 903 | $sName = $wgRequest->getCookie('UserName'); |
| 904 | 904 | $_SESSION['wsUserName'] = $sName; |
| 905 | 905 | } else { |
| — | — | @@ -923,7 +923,7 @@ |
| 924 | 924 | if ( isset( $_SESSION['wsToken'] ) ) { |
| 925 | 925 | $passwordCorrect = $_SESSION['wsToken'] == $this->mToken; |
| 926 | 926 | $from = 'session'; |
| 927 | | - } else if ( $wgRequest->getCookie( 'Token' ) ) { |
| | 927 | + } else if ( $wgRequest->getCookie( 'Token' ) !== null ) { |
| 928 | 928 | $passwordCorrect = $this->mToken == $wgRequest->getCookie( 'Token' ); |
| 929 | 929 | $from = 'cookie'; |
| 930 | 930 | } else { |
| Index: trunk/phase3/includes/extauth/vB.php |
| — | — | @@ -61,7 +61,7 @@ |
| 62 | 62 | } else { |
| 63 | 63 | $prefix = $wgExternalAuthConf['cookieprefix']; |
| 64 | 64 | } |
| 65 | | - if ( !$wgRequest->getCookie( 'sessionhash', $prefix ) ) { |
| | 65 | + if ( $wgRequest->getCookie( 'sessionhash', $prefix ) === null ) { |
| 66 | 66 | return false; |
| 67 | 67 | } |
| 68 | 68 | |