From 5d649dbc480b2ad0dcce57b289c1fcb3126a620f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 2 Apr 2006 04:14:45 +0000
Subject: [PATCH] Live fix: session token vanishing logging FIXME: uses
 wikimedia paths, needs to be generalized

---
 includes/User.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/includes/User.php b/includes/User.php
index 8f4ca42547..e70bc72eb5 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1689,13 +1689,12 @@ class User {
 	 */
 	function matchEditToken( $val, $salt = '' ) {
 		global $wgMemc;
-
-/*
-		if ( !isset( $_SESSION['wsEditToken'] ) ) {
+		$sessionToken = $this->editToken( $salt );
+		if ( $val != $sessionToken ) {
 			$logfile = '/home/wikipedia/logs/session_debug/session.log';
 			$mckey = memsess_key( session_id() );
 			$uname = @posix_uname();
-			$msg = "wsEditToken not set!\n" .
+			$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" .
@@ -1704,8 +1703,7 @@ class User {
 
 			@error_log( $msg, 3, $logfile );
 		}
-*/
-		return ( $val == $this->editToken( $salt ) );
+		return $val == $sessionToken;
 	}
 
 	/**
-- 
2.20.1