Merge "(bug 27757) API method for retrieving tokens"

diff --combined includes/api/ApiMain.php
index 8fd8883,554e87b..2105b81
--- 1/includes/api/ApiMain.php
--- 2/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@@ -61,6 -61,7 +61,7 @@@ class ApiMain extends ApiBase 
                'paraminfo' => 'ApiParamInfo',
                'rsd' => 'ApiRsd',
                'compare' => 'ApiComparePages',
+               'tokens' => 'ApiTokens',
  
                // Write modules
                'purge' => 'ApiPurge',
@@@ -595,11 -596,11 +596,11 @@@
  
                // Die if token required, but not provided (unless there is a gettoken parameter)
                $salt = $module->getTokenSalt();
 -              if ( $salt !== false && !$moduleParams['gettoken'] ) {
 +              if ( $salt !== false && isset( $moduleParams['gettoken'] ) && !$moduleParams['gettoken'] ) {
                        if ( !isset( $moduleParams['token'] ) ) {
                                $this->dieUsageMsg( array( 'missingparam', 'token' ) );
                        } else {
 -                              if ( !$this->getUser()->matchEditToken( $moduleParams['token'], $salt, $this->getRequest() ) ) {
 +                              if ( !$this->getUser()->matchEditToken( $moduleParams['token'], $salt ) ) {
                                        $this->dieUsageMsg( 'sessionfailure' );
                                }
                        }