fix typo in comment

[lhc/web/wiklou.git] / includes / specials / SpecialPreferences.php

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index 900ac73..6930440 100644 (file)
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -4,66 +4,72 @@ class SpecialPreferences extends SpecialPage {
        function __construct() {
                parent::__construct( 'Preferences' );
        }
-       
+
        function execute( $par ) {
                global $wgOut, $wgUser, $wgRequest;
-               
+
                $this->setHeaders();
                $this->outputHeader();
-
-               $wgOut->addScriptFile( 'prefs.js' );
-
                $wgOut->disallowUserJs();  # Prevent hijacked user scripts from sniffing passwords etc.
-               
+
                if ( $wgUser->isAnon() ) {
-                       $wgOut->showErrorPage( 'prefsnologin', 'prefsnologintext', array($this->getTitle()->getPrefixedDBkey()) );
+                       $wgOut->showErrorPage( 'prefsnologin', 'prefsnologintext', array( $this->getTitle()->getPrefixedDBkey() ) );
                        return;
                }
                if ( wfReadOnly() ) {
                        $wgOut->readOnlyPage();
                        return;
                }
-               
+
                if ( $par == 'reset' ) {
                        $this->showResetForm();
                        return;
                }
+               
+               $wgOut->addScriptFile( 'prefs.js' );
 
                if ( $wgRequest->getCheck( 'success' ) ) {
                        $wgOut->wrapWikiMsg(
-                               '<div class="successbox"><strong>$1</strong></div>',
+                               '<div class="successbox"><strong>$1</strong></div><div id="mw-pref-clear"></div>',
                                'savedprefs'
                        );
                }
                
+               if ( $wgRequest->getCheck( 'eauth' ) ) {
+                       $wgOut->wrapWikiMsg( "<div class='error' style='clear: both;'>$1</div>",
+                                                                       'eauthentsent', $wgUser->getName() );
+               }
+
                $htmlForm = Preferences::getFormObject( $wgUser );
+               $htmlForm->setSubmitCallback( array( 'Preferences', 'tryUISubmit' ) );
 
                $htmlForm->show();
        }
-       
+
        function showResetForm() {
                global $wgOut;
-               
+
                $wgOut->addWikiMsg( 'prefs-reset-intro' );
-               
+
                $htmlForm = new HTMLForm( array(), 'prefs-restore' );
-               
+
                $htmlForm->setSubmitText( wfMsg( 'restoreprefs' ) );
-               $htmlForm->setTitle( $this->getTitle('reset') );
+               $htmlForm->setTitle( $this->getTitle( 'reset' ) );
                $htmlForm->setSubmitCallback( array( __CLASS__, 'submitReset' ) );
                $htmlForm->suppressReset();
-               
+
                $htmlForm->show();
        }
-       
+
        static function submitReset( $formData ) {
                global $wgUser, $wgOut;
                $wgUser->resetOptions();
-               
+               $wgUser->saveSettings();
+
                $url = SpecialPage::getTitleFor( 'Preferences' )->getFullURL( 'success' );
-               
+
                $wgOut->redirect( $url );
-               
+
                return true;
        }
 }