optimize customer list, RT#20173

[freeside.git] / FS / FS / Msgcat.pm

diff --git a/FS/FS/Msgcat.pm b/FS/FS/Msgcat.pm
index 2429805..b6f36bf 100644 (file)
--- a/FS/FS/Msgcat.pm
+++ b/FS/FS/Msgcat.pm
@@ -58,8 +58,10 @@ our %cache;
 
 sub _gettext {
   my $msgcode = shift;
+  return '' unless defined($msgcode) && length($msgcode) > 0;
+
   my $locale =  (@_ && shift)
-             || $FS::CurrentUser::CurrentUser->option('locale')
+             || $FS::CurrentUser::CurrentUser->locale
              || $def_locale;
 
   return $cache{$locale}->{$msgcode} if exists $cache{$locale}->{$msgcode};
@@ -86,6 +88,7 @@ sub _gettext {
         warn "WARNING: auto-inserting message for msgcode $msgcode in locale $locale";
         $newmsgcat->insert;
     }
+    return $msgcode;
   }
 
 }