Following r100264, update usages in core

diff --git a/includes/Article.php b/includes/Article.php
index fe68ddd..7c359fb 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -873,7 +873,7 @@ class Article extends Page {
                        return;
                }
 
-               $token = $wgUser->editToken( $rcid );
+               $token = $wgUser->getEditToken( $rcid );
                $wgOut->preventClickjacking();
 
                $wgOut->addHTML(
@@ -1287,7 +1287,7 @@ class Article extends Page {
 
                        if ( $this->getContext()->getUser()->isAllowed( 'trackback' ) ) {
                                $delurl = $this->getTitle()->getFullURL( "action=deletetrackback&tbid=" .
-                                       $o->tb_id . "&token=" . urlencode( $this->getContext()->getUser()->editToken() ) );
+                                       $o->tb_id . "&token=" . urlencode( $this->getContext()->getUser()->getEditToken() ) );
                                $rmvtxt = wfMsg( 'trackbackremove', htmlspecialchars( $delurl ) );
                        }
 
@@ -1524,7 +1524,7 @@ class Article extends Page {
                        </tr>" .
                        Xml::closeElement( 'table' ) .
                        Xml::closeElement( 'fieldset' ) .
-                       Html::hidden( 'wpEditToken', $user->editToken( array( 'delete', $this->getTitle()->getPrefixedText() ) ) ) .
+                       Html::hidden( 'wpEditToken', $user->getEditToken( array( 'delete', $this->getTitle()->getPrefixedText() ) ) ) .
                        Xml::closeElement( 'form' );
 
                        if ( $user->isAllowed( 'editinterface' ) ) {

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 780cb53..cad6503 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1955,7 +1955,7 @@ HTML
                 * include the constant suffix to prevent editing from
                 * broken text-mangling proxies.
                 */
-               $wgOut->addHTML( "\n" . Html::hidden( "wpEditToken", $wgUser->editToken() ) . "\n" );
+               $wgOut->addHTML( "\n" . Html::hidden( "wpEditToken", $wgUser->getEditToken() ) . "\n" );
        }
 
        /**

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index a528213..eedb68e 100644 (file)
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -194,7 +194,7 @@ class FileDeleteForm {
                        'id' => 'mw-img-deleteconfirm' ) ) .
                        Xml::openElement( 'fieldset' ) .
                        Xml::element( 'legend', null, wfMsg( 'filedelete-legend' ) ) .
-                       Html::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ) .
+                       Html::hidden( 'wpEditToken', $wgUser->getEditToken( $this->oldimage ) ) .
                        $this->prepareMessage( 'filedelete-intro' ) .
                        Xml::openElement( 'table', array( 'id' => 'mw-img-deleteconfirm-table' ) ) .
                        "<tr>

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 6336e5b..ec2486c 100644 (file)
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -493,7 +493,7 @@ class HTMLForm extends ContextSource {
 
                $html = '';
                if( $this->getMethod() == 'post' ){
-                       $html .= Html::hidden( 'wpEditToken', $this->getUser()->editToken(), array( 'id' => 'wpEditToken' ) ) . "\n";
+                       $html .= Html::hidden( 'wpEditToken', $this->getUser()->getEditToken(), array( 'id' => 'wpEditToken' ) ) . "\n";
                        $html .= Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) . "\n";
                }
 

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index f9aab29..0fbca0c 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -988,7 +988,7 @@ class ImageHistoryList {
                                        array(
                                                'action' => 'revert',
                                                'oldimage' => $img,
-                                               'wpEditToken' => $wgUser->editToken( $img )
+                                               'wpEditToken' => $wgUser->getEditToken( $img )
                                        ),
                                        array( 'known', 'noclasses' )
                                );
@@ -1016,7 +1016,7 @@ class ImageHistoryList {
                                        array(
                                                'target' => $this->title->getPrefixedText(),
                                                'file' => $img,
-                                               'token' => $wgUser->editToken( $img )
+                                               'token' => $wgUser->getEditToken( $img )
                                        ),
                                        array( 'known', 'noclasses' )
                                );

diff --git a/includes/Linker.php b/includes/Linker.php
index 5608eb2..aa4aab9 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1581,7 +1581,7 @@ class Linker {
                $query = array(
                        'action' => 'rollback',
                        'from' => $rev->getUserText(),
-                       'token' => $wgUser->editToken( array( $title->getPrefixedText(), $rev->getUserText() ) ),
+                       'token' => $wgUser->getEditToken( array( $title->getPrefixedText(), $rev->getUserText() ) ),
                );
                if ( $wgRequest->getBool( 'bot' ) ) {
                        $query['bot'] = '1';

diff --git a/includes/User.php b/includes/User.php
index b879fbb..6dab268 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -3199,7 +3199,7 @@ class User {
         * @param $request WebRequest object to use or null to use $wgRequest
         * @return String The new edit token
         */
-       public function editToken( $salt = '', $request = null ) {
+       public function editToken( $salt = '', $request = null ) {  
                return $this->getEditToken( $salt, $request );
        }
        
@@ -3258,7 +3258,7 @@ class User {
         * @return Boolean: Whether the token matches
         */
        public function matchEditToken( $val, $salt = '', $request = null ) {
-               $sessionToken = $this->editToken( $salt, $request );
+               $sessionToken = $this->getEditToken( $salt, $request );
                if ( $val != $sessionToken ) {
                        wfDebug( "User::matchEditToken: broken session data\n" );
                }
@@ -3275,7 +3275,7 @@ class User {
         * @return Boolean: Whether the token matches
         */
        public function matchEditTokenNoSuffix( $val, $salt = '', $request = null ) {
-               $sessionToken = $this->editToken( $salt, $request );
+               $sessionToken = $this->getEditToken( $salt, $request );
                return substr( $sessionToken, 0, 32 ) == substr( $val, 0, 32 );
        }
 

diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php
index 4d539f4..f4d6d50 100644 (file)
--- a/includes/actions/WatchAction.php
+++ b/includes/actions/WatchAction.php
@@ -123,7 +123,7 @@ class WatchAction extends FormAction {
 
                // This token stronger salted and not compatible with ApiWatch
                // It's title/action specific because index.php is GET and API is POST
-               return $user->editToken( $salt );
+               return $user->getEditToken( $salt );
        }
 
        /**

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 1bba4ca..08bc392 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -435,7 +435,7 @@ class DifferenceEngine extends ContextSource {
                                // Build the link
                                if ( $rcid ) {
                                        $this->getOutput()->preventClickjacking();
-                                       $token = $this->getUser()->editToken( $rcid );
+                                       $token = $this->getUser()->getEditToken( $rcid );
                                        $this->mMarkPatrolledLink = ' <span class="patrollink">[' . Linker::linkKnown(
                                                $this->mNewPage,
                                                $this->msg( 'markaspatrolleddiff' )->escaped(),

diff --git a/includes/resourceloader/ResourceLoaderUserTokensModule.php b/includes/resourceloader/ResourceLoaderUserTokensModule.php
index 3065935..b423ecf 100644 (file)
--- a/includes/resourceloader/ResourceLoaderUserTokensModule.php
+++ b/includes/resourceloader/ResourceLoaderUserTokensModule.php
@@ -40,7 +40,7 @@ class ResourceLoaderUserTokensModule extends ResourceLoaderModule {
                global $wgUser;
 
                return array(
-                       'editToken' => $wgUser->edittoken(),
+                       'editToken' => $wgUser->getEditToken(),
                        'watchToken' => ApiQueryInfo::getWatchToken(null, null),
                );
        }

diff --git a/includes/revisiondelete/RevisionDelete.php b/includes/revisiondelete/RevisionDelete.php
index 0a6566b..0ba6675 100644 (file)
--- a/includes/revisiondelete/RevisionDelete.php
+++ b/includes/revisiondelete/RevisionDelete.php
@@ -584,7 +584,7 @@ class RevDel_FileItem extends RevDel_Item {
                                        array(
                                                'target' => $this->list->title->getPrefixedText(),
                                                'file'   => $this->file->getArchiveName(),
-                                               'token'  => $this->list->getUser()->editToken(
+                                               'token'  => $this->list->getUser()->getEditToken(
                                                        $this->file->getArchiveName() )
                                        )
                                );
@@ -733,7 +733,7 @@ class RevDel_ArchivedFileItem extends RevDel_FileItem {
                                array(
                                        'target' => $this->list->title->getPrefixedText(),
                                        'file' => $key,
-                                       'token' => $this->list->getUser()->editToken( $key )
+                                       'token' => $this->list->getUser()->getEditToken( $key )
                                )
                        );
                }

diff --git a/includes/specials/SpecialChangeEmail.php b/includes/specials/SpecialChangeEmail.php
index 2e606ec..62be543 100644 (file)
--- a/includes/specials/SpecialChangeEmail.php
+++ b/includes/specials/SpecialChangeEmail.php
@@ -118,7 +118,7 @@ class SpecialChangeEmail extends UnlistedSpecialPage {
                                        'method' => 'post',
                                        'action' => $this->getTitle()->getLocalUrl(),
                                        'id' => 'mw-changeemail-form' ) ) . "\n" .
-                       Html::hidden( 'token', $user->editToken() ) . "\n" .
+                       Html::hidden( 'token', $user->getEditToken() ) . "\n" .
                        Html::hidden( 'returnto', $this->getRequest()->getVal( 'returnto' ) ) . "\n" .
                        wfMsgExt( 'changeemail-text', array( 'parse' ) ) . "\n" .
                        Xml::openElement( 'table', array( 'id' => 'mw-changeemail-table' ) ) . "\n" .

diff --git a/includes/specials/SpecialChangePassword.php b/includes/specials/SpecialChangePassword.php
index dc43e9a..9fe6242 100644 (file)
--- a/includes/specials/SpecialChangePassword.php
+++ b/includes/specials/SpecialChangePassword.php
@@ -143,7 +143,7 @@ class SpecialChangePassword extends UnlistedSpecialPage {
                                        'method' => 'post',
                                        'action' => $this->getTitle()->getLocalUrl(),
                                        'id' => 'mw-resetpass-form' ) ) . "\n" .
-                       Html::hidden( 'token', $user->editToken() ) . "\n" .
+                       Html::hidden( 'token', $user->getEditToken() ) . "\n" .
                        Html::hidden( 'wpName', $this->mUserName ) . "\n" .
                        Html::hidden( 'wpDomain', $this->mDomain ) . "\n" .
                        Html::hidden( 'returnto', $this->getRequest()->getVal( 'returnto' ) ) . "\n" .

diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php
index 857cdcf..49c3c4e 100644 (file)
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -97,7 +97,7 @@ class EmailConfirmation extends UnlistedSpecialPage {
                        }
                        $out->addWikiMsg( 'confirmemail_text' );
                        $form  = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalUrl() ) );
-                       $form .= Html::hidden( 'token', $user->editToken() );
+                       $form .= Html::hidden( 'token', $user->getEditToken() );
                        $form .= Xml::submitButton( wfMsg( 'confirmemail_send' ) );
                        $form .= Xml::closeElement( 'form' );
                        $out->addHTML( $form );

diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index 0bc0f8f..c5e944a 100644 (file)
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -210,7 +210,7 @@ class SpecialImport extends SpecialPage {
                                        "</td>
                                </tr>" .
                                Xml::closeElement( 'table' ).
-                               Html::hidden( 'editToken', $user->editToken() ) .
+                               Html::hidden( 'editToken', $user->getEditToken() ) .
                                Xml::closeElement( 'form' ) .
                                Xml::closeElement( 'fieldset' )
                        );
@@ -240,7 +240,7 @@ class SpecialImport extends SpecialPage {
                                wfMsgExt( 'import-interwiki-text', array( 'parse' ) ) .
                                Html::hidden( 'action', 'submit' ) .
                                Html::hidden( 'source', 'interwiki' ) .
-                               Html::hidden( 'editToken', $user->editToken() ) .
+                               Html::hidden( 'editToken', $user->getEditToken() ) .
                                Xml::openElement( 'table', array( 'id' => 'mw-import-table' ) ) .
                                "<tr>
                                        <td class='mw-label'>" .

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index ac01ad2..b4b5f10 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -235,7 +235,7 @@ class SpecialMergeHistory extends SpecialPage {
                $misc .= Html::hidden( 'destID', $this->mDestObj->getArticleID() );
                $misc .= Html::hidden( 'target', $this->mTarget );
                $misc .= Html::hidden( 'dest', $this->mDest );
-               $misc .= Html::hidden( 'wpEditToken', $this->getUser()->editToken() );
+               $misc .= Html::hidden( 'wpEditToken', $this->getUser()->getEditToken() );
                $misc .= Xml::closeElement( 'form' );
                $out->addHTML( $misc );
 

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 49cf0d8..e3003da 100644 (file)
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -189,7 +189,7 @@ class MovePageForm extends UnlistedSpecialPage {
                        $out->addWikiMsg( 'movepagetalktext' );
                }
 
-               $token = htmlspecialchars( $user->editToken() );
+               $token = htmlspecialchars( $user->getEditToken() );
 
                if ( !empty($err) ) {
                        $out->addSubtitle( $this->msg( 'formerror' ) );

diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php
index b8d0636..9f15fc2 100644 (file)
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -294,7 +294,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
                                        'action' => $this->getTitle()->getLocalUrl(
                                                'target=' . urlencode( $oimage->getName() ) .
                                                '&file=' . urlencode( $archiveName ) .
-                                               '&token=' . urlencode( $this->getUser()->editToken( $archiveName ) ) )
+                                               '&token=' . urlencode( $this->getUser()->getEditToken( $archiveName ) ) )
                                        )
                                ) .
                                Xml::submitButton( wfMsg( 'revdelete-show-file-submit' ) ) .
@@ -404,7 +404,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
                                        '</td>' .
                                "</tr>\n" .
                                Xml::closeElement( 'table' ) .
-                               Html::hidden( 'wpEditToken', $this->getUser()->editToken() ) .
+                               Html::hidden( 'wpEditToken', $this->getUser()->getEditToken() ) .
                                Html::hidden( 'target', $this->targetObj->getPrefixedText() ) .
                                Html::hidden( 'type', $this->typeName ) .
                                Html::hidden( 'ids', implode( ',', $this->ids ) ) .

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index d130b13..1163a96 100644 (file)
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -862,7 +862,7 @@ class SpecialUndelete extends SpecialPage {
                        Xml::element( 'input', array(
                                'type' => 'hidden',
                                'name' => 'wpEditToken',
-                               'value' => $user->editToken() ) ) .
+                               'value' => $user->getEditToken() ) ) .
                        Xml::element( 'input', array(
                                'type' => 'submit',
                                'name' => 'preview',
@@ -968,7 +968,7 @@ class SpecialUndelete extends SpecialPage {
                                'action' => $this->getTitle()->getLocalURL(
                                        'target=' . urlencode( $this->mTarget ) .
                                        '&file=' . urlencode( $key ) .
-                                       '&token=' . urlencode( $this->getUser()->editToken( $key ) ) )
+                                       '&token=' . urlencode( $this->getUser()->getEditToken( $key ) ) )
                                )
                        ) .
                        Xml::submitButton( wfMsg( 'undelete-show-file-submit' ) ) .
@@ -1143,7 +1143,7 @@ class SpecialUndelete extends SpecialPage {
                if ( $this->mAllowed ) {
                        # Slip in the hidden controls here
                        $misc  = Html::hidden( 'target', $this->mTarget );
-                       $misc .= Html::hidden( 'wpEditToken', $this->getUser()->editToken() );
+                       $misc .= Html::hidden( 'wpEditToken', $this->getUser()->getEditToken() );
                        $misc .= Xml::closeElement( 'form' );
                        $out->addHTML( $misc );
                }
@@ -1301,7 +1301,7 @@ class SpecialUndelete extends SpecialPage {
                                array(
                                        'target' => $this->mTargetObj->getPrefixedText(),
                                        'file' => $key,
-                                       'token' => $this->getUser()->editToken( $key )
+                                       'token' => $this->getUser()->getEditToken( $key )
                                )
                        );
                        if( $file->isDeleted( File::DELETED_FILE ) ) {

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 2be6e98..9f5f922 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -439,7 +439,7 @@ class UserrightsPage extends SpecialPage {
                $this->getOutput()->addHTML(
                        Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalURL(), 'name' => 'editGroup', 'id' => 'mw-userrights-form2' ) ) .
                        Html::hidden( 'user', $this->mTarget ) .
-                       Html::hidden( 'wpEditToken', $this->getUser()->editToken( $this->mTarget ) ) .
+                       Html::hidden( 'wpEditToken', $this->getUser()->getEditToken( $this->mTarget ) ) .
                        Xml::openElement( 'fieldset' ) .
                        Xml::element( 'legend', array(), wfMsg( 'userrights-editusergroup' ) ) .
                        wfMessage( 'editinguser' )->params( wfEscapeWikiText( $user->getName() ) )->rawParams( $userToolLinks )->parse() .