Conflicts:
httemplate/pref/pref-process.html
httemplate/pref/pref.html
+++ /dev/null
-% if ( $cgi->param('alert') ) {
- <FONT SIZE="+1" COLOR="#008000"><% mt($cgi->param('alert')) |h %></FONT>
- <BR><BR>
-% }
\ No newline at end of file
% if ( $error ) {
% $cgi->param('error', $error);
-<% $cgi->redirect(popurl(1). "pref.html?". $cgi->query_string ) %>
+ <% $cgi->redirect(popurl(1). "pref.html?". $cgi->query_string ) %>
% } else {
<% include('/elements/header.html', 'Preferences updated') %>
<% include('/elements/footer.html') %>
-<% $cgi->redirect(popurl(1). "pref.html?alert=Preferences updated" ) %>
% }
<%init>
<% include('/elements/error.html') %>
-<<<<<<< HEAD
-=======
-<& /elements/alert.html &>
-
% if ( FS::Auth->auth_class->can('change_password') ) {
<% mt('Change password (leave blank for no change)') |h %>