http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70442

Revision: 70442
Author:   kaldari
Date:     2010-08-04 00:26:12 +0000 (Wed, 04 Aug 2010)

Log Message:
-----------
Better fix for r70440. Actually it looks like the old token stuff was left over 
from previous auth scheme

Modified Paths:
--------------
    trunk/extensions/CentralNotice/SpecialNoticeTemplate.php

Modified: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
===================================================================
--- trunk/extensions/CentralNotice/SpecialNoticeTemplate.php    2010-08-04 
00:11:45 UTC (rev 70441)
+++ trunk/extensions/CentralNotice/SpecialNoticeTemplate.php    2010-08-04 
00:26:12 UTC (rev 70442)
@@ -54,13 +54,12 @@
 
                                // Handle translation message update
                                $update = $wgRequest->getArray( 'updateText' );
-                               $token  = $wgRequest->getArray( 'token' );
                                if ( isset ( $update ) ) {
                                        foreach ( $update as $lang => $messages 
) {
                                                foreach ( $messages as $text => 
$translation ) {
                                                        // If we actually have 
text
                                                        if ( $translation ) {
-                                                               
$this->updateMessage( $text, $translation, $lang, $token );
+                                                               
$this->updateMessage( $text, $translation, $lang );
                                                        }
                                                }
                                        }
@@ -216,9 +215,6 @@
                        $readonly = array( 'readonly' => 'readonly' );
                }
 
-               // Get token
-               $token = $wgUser->editToken();
-
                // Get user's language
                $wpUserLang = $wgRequest->getVal( 'wpUserLanguage' ) ? 
$wgRequest->getVal( 'wpUserLanguage' ) : $wgContLanguageCode;
 
@@ -335,7 +331,6 @@
                                $htmlOut .= Xml::closeElement( 'tr' );
                        }
                        if ( $this->editable ) {
-                               $htmlOut .= Xml::hidden( 'token', $token );
                                $htmlOut .= Xml::hidden( 'wpUserLanguage', 
$wpUserLang );
                                $htmlOut .= Xml::openElement( 'tr' );
                                $htmlOut .= Xml::tags( 'td', array( 'colspan' 
=> 4 ),
@@ -481,7 +476,7 @@
                return $wgOut->addHtml( $htmlOut );
        }
 
-       private function updateMessage( $text, $translation, $lang, $token = 
false ) {
+       private function updateMessage( $text, $translation, $lang ) {
                $title = Title::newFromText(
                        ( $lang == 'en' ) ? "Centralnotice-{$text}" : 
"Centralnotice-{$text}/{$lang}",
                        NS_MEDIAWIKI



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to