r62566 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r62565‎ | r62566 | r62567 >
Date:01:29, 16 February 2010
Author:reedy
Status:ok
Tags:
Comment:
Decomment parts accidentally commited commented in r62557
Modified paths:
  • /trunk/phase3/includes/api/ApiMain.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/api/ApiMain.php
@@ -422,8 +422,8 @@
423423 $this->dieUsageMsg( array( 'missingparam', 'token' ) );
424424 } else {
425425 global $wgUser;
426 - if ( ( $salt != null /*&& !$wgUser->matchEditToken( $moduleParams['token'], $salt )*/ )
427 - /*|| !$wgUser->matchEditToken( $moduleParams['token'] )*/ ) {
 426+ if ( ( $salt != null && !$wgUser->matchEditToken( $moduleParams['token'], $salt ) )
 427+ || !$wgUser->matchEditToken( $moduleParams['token'] ) ) {
428428 $this->dieUsageMsg( array( 'sessionfailure' ) );
429429 }
430430 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r62557Refactor requiresToken to getTokenSalt - Returns salt if exists, null if no s...reedy23:53, 15 February 2010

Status & tagging log