* take $defaultPreferences['rememberpassword'] out of section personal/i18n and move...
authorSiebrand Mazeland <siebrand@users.mediawiki.org>
Tue, 28 Apr 2009 14:00:43 +0000 (14:00 +0000)
committerSiebrand Mazeland <siebrand@users.mediawiki.org>
Tue, 28 Apr 2009 14:00:43 +0000 (14:00 +0000)
* move gender selection to above change password link

includes/Preferences.php

index a4cba79..6a81ef9 100644 (file)
@@ -150,6 +150,20 @@ class Preferences {
                                        );
                }
                
+               
+               $defaultPreferences['gender'] =
+                               array(
+                                       'type' => 'select',
+                                       'section' => 'personal/info',
+                                       'options' => array(
+                                               wfMsg('gender-male') => 'male',
+                                               wfMsg('gender-female') => 'female',
+                                               wfMsg('gender-unknown') => 'unknown',
+                                       ),
+                                       'label-message' => 'yourgender',
+                                       'help-message' => 'prefs-help-gender',
+                               );
+
                global $wgAuth;
                if ($wgAuth->allowPasswordChange()) {
                        global $wgUser; // For skin.
@@ -167,17 +181,11 @@ class Preferences {
                                        );
                }
                
-               $defaultPreferences['gender'] =
+               $defaultPreferences['rememberpassword'] =
                                array(
-                                       'type' => 'select',
+                                       'type' => 'toggle',
+                                       'label-message' => 'tog-rememberpassword',
                                        'section' => 'personal/info',
-                                       'options' => array(
-                                               wfMsg('gender-male') => 'male',
-                                               wfMsg('gender-female') => 'female',
-                                               wfMsg('gender-unknown') => 'unknown',
-                                       ),
-                                       'label-message' => 'yourgender',
-                                       'help-message' => 'prefs-help-gender',
                                );
                                
                // Language
@@ -242,13 +250,6 @@ class Preferences {
                                        );
                }
                
-               $defaultPreferences['rememberpassword'] =
-                               array(
-                                       'type' => 'toggle',
-                                       'label-message' => 'tog-rememberpassword',
-                                       'section' => 'personal/i18n',
-                               );
-               
                global $wgMaxSigChars;
                $defaultPreferences['nickname'] =
                                array(