From d99b9356c3d59c1eb3d0a05216d119daefaf28e3 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 09 Oct 2008 08:54:21 -0400
Subject: [PATCH] - set mbstring's internal encoding in proper place

---
 program/include/main.inc   |    8 +++-----
 program/include/iniset.php |    5 +++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/program/include/iniset.php b/program/include/iniset.php
index 5fe1011..f81c04a 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -62,6 +62,11 @@
   set_time_limit(120);
 }
 
+// set internal encoding for mbstring extension
+if(extension_loaded('mbstring'))
+  mb_internal_encoding(RCMAIL_CHARSET);
+	      
+
 /**
  * Use PHP5 autoload for dynamic class loading
  * 
diff --git a/program/include/main.inc b/program/include/main.inc
index 0214d32..9223e26 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -207,12 +207,10 @@
       }
     }
 
-  // settings for mbstring module (by Tadashi Jokagi)
-  if (is_null($mbstring_loaded)) {
-    if ($mbstring_loaded = extension_loaded("mbstring"))
-      mb_internal_encoding(RCMAIL_CHARSET);
-  }
 
+  if (is_null($mbstring_loaded))
+    $mbstring_loaded = extension_loaded('mbstring');
+    
   // convert charset using mbstring module
   if ($mbstring_loaded)
     {

--
Gitblit v1.9.1