From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 25 Jul 2005 07:06:46 +0000 (+0000)
Subject: committed live hack, we have to make sure MediaWiki does actually work out of the box
X-Git-Tag: 1.5.0beta4~33
X-Git-Url: https://git.cyclocoop.org/?a=commitdiff_plain;h=ee423f57a90a22e63eb554f329efff41dbb11485;p=lhc%2Fweb%2Fwiklou.git

committed live hack, we have to make sure MediaWiki does actually work out of the box
---

diff --git a/includes/User.php b/includes/User.php
index ad537b0eeb..c4b4e819b3 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -528,7 +528,7 @@ class User {
 	 * Check if user is blocked
 	 * @return bool True if blocked, false otherwise
 	 */
-	function isBlocked( $bFromSlave = false ) {
+	function isBlocked( $bFromSlave = true ) { // hacked from false due to horrible probs on site
 		$this->getBlockedStatus( $bFromSlave );
 		return $this->mBlockedby !== 0;
 	}
@@ -1619,6 +1619,23 @@ class User {
 	 * @access public
 	 */
 	function matchEditToken( $val, $salt = '' ) {
+		global $wgMemc;
+
+/*
+		if ( !isset( $_SESSION['wsEditToken'] ) ) {
+			$logfile = '/home/wikipedia/logs/session_debug/session.log';
+			$mckey = memsess_key( session_id() );
+			$uname = @posix_uname();
+			$msg = "wsEditToken not set!\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 );
+		}
+*/
 		return ( $val == $this->editToken( $salt ) );
 	}