(bug 13140) Show parent categories in category namespace

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

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index c1cb374..ca163a6 100644 (file)
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -306,7 +306,7 @@ class PreferencesForm {
                if( $wgEnableEmail ) {
                        $newadr = $this->mUserEmail;
                        $oldadr = $wgUser->getEmail();
-                       if( ($newadr != '') && (strtolower($newadr) != strtolower($oldadr)) ) {
+                       if( ($newadr != '') && ($newadr != $oldadr) ) {
                                # the user has supplied a new email address on the login page
                                if( $wgUser->isValidEmailAddr( $newadr ) ) {
                                        $wgUser->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record
@@ -524,11 +524,11 @@ class PreferencesForm {
                $wgOut->disallowUserJs();  # Prevent hijacked user scripts from sniffing passwords etc.
 
                if ( $this->mSuccess || 'success' == $status ) {
-                       $wgOut->addWikitext( '<div class="successbox"><strong>'. wfMsg( 'savedprefs' ) . '</strong></div>' );
+                       $wgOut->wrapWikiMsg( '<div class="successbox"><strong>$1</strong></div>', 'savedprefs' );
                } else  if ( 'error' == $status ) {
-                       $wgOut->addWikitext( '<div class="errorbox"><strong>' . $message  . '</strong></div>' );
+                       $wgOut->addWikiText( '<div class="errorbox"><strong>' . $message  . '</strong></div>' );
                } else if ( '' != $status ) {
-                       $wgOut->addWikitext( $message . "\n----" );
+                       $wgOut->addWikiText( $message . "\n----" );
                }
 
                $qbs = $wgLang->getQuickbarSettings();