Bug 365407: Reorder tabs in userprefs.cgi - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=justdave

2 files changed, 4 insertions, 4 deletions

diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index 5f163a899..7d5f11558 100644
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -43,14 +43,14 @@
    style_urls = ['skins/standard/admin.css']
  %]
 
-[% tabs = [ { name => "account", label => "Account Preferences", 
-              link => "userprefs.cgi?tab=account", saveable => "1" },
-            { name => "settings", label => "General Preferences", 
+[% tabs = [{ name => "settings", label => "General Preferences",
               link => "userprefs.cgi?tab=settings", saveable => "1" },
             { name => "email", label => "Email Preferences", 
               link => "userprefs.cgi?tab=email", saveable => "1" },
             { name => "saved-searches", label => "Saved Searches", 
               link => "userprefs.cgi?tab=saved-searches", saveable => "1" },
+            { name => "account", label => "Name and Password",
+              link => "userprefs.cgi?tab=account", saveable => "1" },
             { name => "permissions", label => "Permissions", 
               link => "userprefs.cgi?tab=permissions", saveable => "0" } ] %]
 
diff --git a/userprefs.cgi b/userprefs.cgi
index 14746ada1..8e4cf5576 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -506,7 +506,7 @@ $cgi->param('Bugzilla_password', $bugzilla_password);
 
 $vars->{'changes_saved'} = $cgi->param('dosave');
 
-my $current_tab_name = $cgi->param('tab') || "account";
+my $current_tab_name = $cgi->param('tab') || "settings";
 
 # The SWITCH below makes sure that this is valid
 trick_taint($current_tab_name);