properly fix utf-8 calendar

diff --git a/include/functions.inc.php b/include/functions.inc.php
index bddfea70965f4c386093b30fc4c08b15bcef302c..282ccf57edba859a274bd5b3eb13e8e9fe39148f 100644 (file)
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -80,7 +80,7 @@ function serendipity_strftime($format, $timestamp = null, $useOffset = true) {
 
     if ($is_win_utf === null) {
         // Windows does not have UTF-8 locales.
-        $is_win_utf = (LANG_CHARSET == 'UTF-8' && $serendipity['lang'] == 'de' && strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' ? true : false);
+        $is_win_utf = (LANG_CHARSET == 'UTF-8' && strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' ? true : false);
     }
 
     switch($serendipity['calendar']) {
@@ -106,7 +106,7 @@ function serendipity_strftime($format, $timestamp = null, $useOffset = true) {
             break;
     }
 
-    if ($is_win_utf) {
+    if ($is_win_utf && (empty($serendipity['calendar']) || $serendipity['calendar'] == 'gregorian')) {
         $out = utf8_encode($out);
     }