From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 16 Feb 2010 01:29:58 +0000 (+0000)
Subject: Decomment parts accidentally commited commented in r62557
X-Git-Tag: 1.31.0-rc.0~37731
X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=commitdiff_plain;h=64f884d74f9d5460ba30e5199e42f11912be1f92;p=lhc%2Fweb%2Fwiklou.git

Decomment parts accidentally commited commented in r62557
---

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 712037fd6c..fa87e57ce2 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -422,8 +422,8 @@ class ApiMain extends ApiBase {
 				$this->dieUsageMsg( array( 'missingparam', 'token' ) );
 			} else {
 				global $wgUser;
-				if ( ( $salt != null /*&& !$wgUser->matchEditToken( $moduleParams['token'], $salt )*/ )
-					/*|| !$wgUser->matchEditToken( $moduleParams['token'] )*/ ) {
+				if ( ( $salt != null && !$wgUser->matchEditToken( $moduleParams['token'], $salt ) )
+					|| !$wgUser->matchEditToken( $moduleParams['token'] ) ) {
 					$this->dieUsageMsg( array( 'sessionfailure' ) );
 				}
 			}