Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / httemplate / pref / pref-process.html

diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html
index 4ff878f..bd6bb86 100644 (file)
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -49,7 +49,7 @@ unless ( $error ) { # if ($access_user) {
 
   #XXX autogen
   my @paramlist = qw( locale menu_position default_customer_view mobile_menu
-                      disable_html_editor
+                      disable_html_editor disable_enter_submit_onetimecharge
                       email_address
                       snom-ip snom-username snom-password
                       vonage-fromnumber vonage-username vonage-password
@@ -80,7 +80,9 @@ if ( !$error and ($FS::TicketSystem::system || '') eq 'RT_Internal' ) {
   my $UserObj = FS::TicketSystem->session('')->{'CurrentUser'}->UserObj;
   # Bypass RT ModifySelf ACL
   $UserObj->CurrentUser( RT::SystemUser );
-  my ($val, $msg) = $UserObj->SetLang($locale);
-  $error = $msg if !$val;
+  if ( $UserObj->Lang ne $locale ) {
+    my ($val, $msg) = $UserObj->SetLang($locale);
+    $error = $msg if !$val;
+  }
 }
 </%init>