fix spurious RT error when not changing language

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

diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html
index 897be25..974b96d 100644 (file)
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -21,7 +21,7 @@ if ( grep { $cgi->param($_) !~ /^\s*$/ }
 
   $access_user = qsearchs( 'access_user', {
     'username'  => getotaker,
-    '_password' => $cgi->param('_password'),
+    '_password' => scalar($cgi->param('_password')),
   } );
 
   $error = 'Current password incorrect; password not changed'
@@ -48,7 +48,7 @@ unless ( $error ) { # if ($access_user) {
   my %param = $access_user->options;
 
   #XXX autogen
-  my @paramlist = qw( menu_position default_customer_view
+  my @paramlist = qw( locale menu_position default_customer_view mobile_menu
                       disable_html_editor
                       email_address
                       snom-ip snom-username snom-password
@@ -73,4 +73,16 @@ unless ( $error ) { # if ($access_user) {
 
 }
 
+if ( !$error and ($FS::TicketSystem::system || '') eq 'RT_Internal' ) {
+  # sync RT user locale on every update
+  my $locale = $access_user->option('locale');
+  FS::TicketSystem->init;
+  my $UserObj = FS::TicketSystem->session('')->{'CurrentUser'}->UserObj;
+  # Bypass RT ModifySelf ACL
+  $UserObj->CurrentUser( RT::SystemUser );
+  if ( $UserObj->Lang ne $locale ) {
+    my ($val, $msg) = $UserObj->SetLang($locale);
+    $error = $msg if !$val;
+  }
+}
 </%init>