Merge email back into user profile, fix regression where you weren't warned that...

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

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index 4e44bf0..d09fb33 100644 (file)
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -35,8 +35,14 @@ class SpecialPreferences extends SpecialPage {
                                '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();
        }