mbstring check by mila

diff --git a/docs/NEWS b/docs/NEWS
index d7ad7e526b7d4d4294e24f2379201f9643224105..5321c036672bee0188322057e87f030d65e2fda1 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.2 ()
 ------------------------------------------------------------------------
 
+    * Stricter mbstring-extension check for special charsets like czech,
+      thanks to mila
+
     * Upgraded DB-scheme to allow longer author usernames
 
     * Improved Spamblock plugin to allow filtering email addresses

diff --git a/include/lang.inc.php b/include/lang.inc.php
index e2302a11f7edaaf980afaf612e7bf3d1c3ed8c97..b7d7c93bf58f55cb556f250860e011970375452e 100644 (file)
--- a/include/lang.inc.php
+++ b/include/lang.inc.php
@@ -59,7 +59,7 @@ if (!defined('serendipity_MB_LOADED') && defined('serendipity_LANG_LOADED')) {
         static $mbstring = null;
 
         if (is_null($mbstring)) {
-            $mbstring = (extension_loaded('mbstring') ? 1 : 0);
+            $mbstring = (extension_loaded('mbstring') && @mb_internal_encoding(LANG_CHARSET) ? 1 : 0);
             if ($mbstring === 1) {
                 if (function_exists('mb_strtoupper')) {
                     $mbstring = 2;