Decomment parts accidentally commited commented in r62557

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 712037f..fa87e57 100644 (file)
--- 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' ) );
                                }
                        }