* (bug 5576) Remove debugging hack in session check

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cc04cc0..fec035c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -71,6 +71,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * installer: hide errors returned when trying to dl() mysql.so / pgsql.so
 * installer: cleanly outputbuffer when dieing out
 * Add $wgReservedUsernames configuration directive to block account creation/use
+* (bug 5576) Remove debugging hack in session check
+
 
 == Compatibility ==
 

diff --git a/includes/User.php b/includes/User.php
index 53a85bf..eec9b9f 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -1691,17 +1691,7 @@ class User {
                global $wgMemc;
                $sessionToken = $this->editToken( $salt );
                if ( $val != $sessionToken ) {
-                       $logfile = '/home/wikipedia/logs/session_debug/session.log';
-                       $mckey = memsess_key( session_id() );
-                       $uname = @posix_uname();
-                       $msg = date('r') . "\nEdit token mismatch, expected $sessionToken got $val\n" .
-                       'apache server=' . $uname['nodename'] . "\n" .
-                       'session_id = ' . session_id() . "\n" .
-                       '$_SESSION=' . var_export( $_SESSION, true ) . "\n" .
-                       '$_COOKIE=' . var_export( $_COOKIE, true ) . "\n" .
-                       "mc get($mckey) = " . var_export( $wgMemc->get( $mckey ), true ) . "\n\n\n";
-
-                       @error_log( $msg, 3, $logfile );
+                       wfDebug( "User::matchEditToken: broken session data\n" );
                }
                return $val == $sessionToken;
        }