Bug 195621 - Back out taint-related changes from bug 160710. Patch by gerv; r,a=justdave.

diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index 9d2b08051c4646efd92d613e6aaf0bcf59dbec71..5892cb40edb2eb2d55a6321eaeb356c9782bb763 100644 (file)
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -101,16 +101,8 @@
 <form name="userprefsform" method="post" action="userprefs.cgi">
   <input type="hidden" name="tab" value="[% current_tab.name %]">
 
-  [%# See bug 160710 for why this is done this way %]
-  [% IF current_tab.name == "account" %]
-    [% PROCESS "account/prefs/account.html.tmpl" %]
-  [% ELSIF current_tab.name == "email" %]
-    [% PROCESS "account/prefs/email.html.tmpl" %]
-  [% ELSIF current_tab.name == "footer" %]
-    [% PROCESS "account/prefs/footer.html.tmpl" %]
-  [% ELSIF current_tab.name == "permissions" %]
-    [% PROCESS "account/prefs/permissions.html.tmpl" %]
-  [% END %]
+  [% PROCESS "account/prefs/${current_tab.name}.html.tmpl" 
+                                                 IF current_tab.name.defined %]
 
   [% IF current_tab.saveable %]
     <input type="hidden" name="dosave" value="1">