summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--template/en/default/account/prefs/prefs.html.tmpl12
-rwxr-xr-xuserprefs.cgi19
2 files changed, 12 insertions, 19 deletions
diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index 17ce7b5d6..93f004dea 100644
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -49,13 +49,23 @@
}"
%]
+[% tabs = [ { name => "account", description => "Account settings",
+ saveable => "1" },
+ { name => "email", description => "Email settings",
+ saveable => "1" },
+ { name => "footer", description => "Page footer",
+ saveable => "1" },
+ { name => "permissions", description => "Permissions",
+ saveable => "0" } ] %]
+
<center>
<table cellspacing="0" cellpadding="10" border="0" width="100%">
<tr>
<td class="spacer">&nbsp;</td>
[% FOREACH tab = tabs %]
- [% IF tab.name == current_tab.name %]
+ [% IF tab.name == current_tab_name %]
+ [% current_tab = tab %]
<td align="center" bgcolor="lightblue" class="selected_tab">
[% tab.description %]
</td>
diff --git a/userprefs.cgi b/userprefs.cgi
index 79690563c..977dda7ee 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -365,24 +365,7 @@ $vars->{'changes_saved'} = $::FORM{'dosave'};
my $current_tab_name = $::FORM{'tab'} || "account";
-my @tabs = ( { name => "account", description => "Account settings",
- saveable => "1" },
- { name => "email", description => "Email settings",
- saveable => "1" },
- { name => "footer", description => "Page footer",
- saveable => "1" },
- { name => "permissions", description => "Permissions",
- saveable => "0" } );
-
-# Work out the current tab
-foreach my $tab (@tabs) {
- if ($tab->{'name'} eq $current_tab_name) {
- $vars->{'current_tab'} = $tab;
- last;
- }
-}
-
-$vars->{'tabs'} = \@tabs;
+$vars->{'current_tab_name'} = $current_tab_name;
# Do any saving, and then display the current tab.
SWITCH: for ($current_tab_name) {