From a656f7a4d499566863e740b0a2a491a535e3ac43 Mon Sep 17 00:00:00 2001
From: Tiago Mello <timello@gmail.com>
Date: Wed, 18 Jan 2012 19:32:46 -0200
Subject: Bug 718905: Move user_preferences hook up, before other actions in
 userprefs.cgi r=dkl, a=LpSolit

---
 userprefs.cgi | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'userprefs.cgi')

diff --git a/userprefs.cgi b/userprefs.cgi
index 94fe1def2..f0d5a8e53 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -514,6 +514,16 @@ check_token_data($token, 'edit_user_prefs') if $save_changes;
 
 # Do any saving, and then display the current tab.
 SWITCH: for ($current_tab_name) {
+
+    # Extensions must set it to 1 to confirm the tab is valid.
+    my $handled = 0;
+    Bugzilla::Hook::process('user_preferences',
+                            { 'vars'       => $vars,
+                              save_changes => $save_changes,
+                              current_tab  => $current_tab_name,
+                              handled      => \$handled });
+    last SWITCH if $handled;
+
     /^account$/ && do {
         SaveAccount() if $save_changes;
         DoAccount();
@@ -538,14 +548,6 @@ SWITCH: for ($current_tab_name) {
         DoSavedSearches();
         last SWITCH;
     };
-    # Extensions must set it to 1 to confirm the tab is valid.
-    my $handled = 0;
-    Bugzilla::Hook::process('user_preferences',
-                            { 'vars'       => $vars,
-                              save_changes => $save_changes,
-                              current_tab  => $current_tab_name,
-                              handled      => \$handled });
-    last SWITCH if $handled;
 
     ThrowUserError("unknown_tab",
                    { current_tab_name => $current_tab_name });
-- 
cgit v1.2.3-24-g4f1b