Reinstating fix for the "to" addresses. Hopefully won't need them for CC

[squirrelmail.git] / functions / i18n.php

diff --git a/functions/i18n.php b/functions/i18n.php
index 56e09d1625f998a242447e986703582a0ec8380d..18a5319c9faf00b20867310c4917353af654031b 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -9,9 +9,11 @@
  ** Internally the output character set is used. Other characters are
  ** encoded using Unicode entities according to HTML 4.0.
  **
+ ** $Id$
  **/
 
    $i18n_php = true;
+   if (! isset($squirrelmail_language)) { $squirrelmail_language = ""; }
 
    // This array specifies the available languages.
    $languages["en"]["NAME"]    = "English";
@@ -762,7 +764,9 @@
       if (isset($sm_language) && $use_gettext &&
          $squirrelmail_language != "" &&
          $languages[$sm_language]["CHARSET"]) {
-         putenv("LC_ALL=".$sm_language);
+         if (ini_get("safe_mode")==FALSE && getenv("LC_ALL")!=$sm_language) {
+            putenv("LC_ALL=".$sm_language);
+         }
          setlocale("LC_ALL", $sm_language);
          bindtextdomain("squirrelmail", "../locale/");
          textdomain("squirrelmail");