* replace hard coded namespace numbers by the php define

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

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 7bb8200..e076b3f 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -11,8 +11,8 @@ class Preferences {
                if (self::$defaultPreferences)
                        return self::$defaultPreferences;
        
-               global $wgLang, $wgRCMaxAge;
-               
+               global $wgRCMaxAge;
+
                $defaultPreferences = array();
 
                self::profilePreferences( $user, $defaultPreferences );
@@ -26,9 +26,9 @@ class Preferences {
                self::watchlistPreferences( $user, $defaultPreferences );
                self::searchPreferences( $user, $defaultPreferences );
                self::miscPreferences( $user, $defaultPreferences );
-                               
+
                wfRunHooks( 'GetPreferences', array( $user, &$defaultPreferences ) );
-                               
+
                ## Prod in defaults from the user
                global $wgDefaultUserOptions;
                foreach( $defaultPreferences as $name => &$info ) {
@@ -993,9 +993,7 @@ class Preferences {
        }
        
        static function validateEmail( $email, $alldata ) {
-               global $wgUser; // To check
-               
-               if ( $email && !$wgUser->isValidEmailAddr( $email ) ) {
+               if ( $email && !User::isValidEmailAddr( $email ) ) {
                        return wfMsgExt( 'invalidemailaddress', 'parseinline' );
                }