| Index: trunk/phase3/includes/User.php |
| — | — | @@ -814,6 +814,7 @@ |
| 815 | 815 | $this->loadDefaults(); |
| 816 | 816 | return false; |
| 817 | 817 | } |
| | 818 | + /* |
| 818 | 819 | if ( isset( $_SESSION['wsUserName'] ) && isset( $_COOKIE["{$wgCookiePrefix}UserName"] ) ) { |
| 819 | 820 | // Cookie and session username should match |
| 820 | 821 | if( $_SESSION['wsUserName'] == $_COOKIE["{$wgCookiePrefix}UserName"] ) { |
| — | — | @@ -822,6 +823,10 @@ |
| 823 | 824 | $this->loadDefaults(); |
| 824 | 825 | return false; |
| 825 | 826 | } |
| | 827 | + } |
| | 828 | + */ |
| | 829 | + if ( isset( $_SESSION['wsUserName'] ) ) { |
| | 830 | + $sName = $_SESSION['wsUserName']; |
| 826 | 831 | } else if ( isset( $_COOKIE["{$wgCookiePrefix}UserName"] ) ) { |
| 827 | 832 | $sName = $_COOKIE["{$wgCookiePrefix}UserName"]; |
| 828 | 833 | $_SESSION['wsUserName'] = $sName; |