From: garvinhicking <garvinhicking>
Date: Fri, 21 Apr 2006 08:37:58 +0000 (+0000)
Subject: properly fix utf-8 calendar
X-Git-Tag: 1.0~37
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=fb4813685d6f515c317c06de7606b37159595381;p=s9y.git

properly fix utf-8 calendar
---

diff --git a/include/functions.inc.php b/include/functions.inc.php
index bddfea7..282ccf5 100644
--- 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);
     }