From be643548f43be4d6d2f0f2d2b27f11abb93f84cf Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Fri, 21 Apr 2006 08:37:56 +0000 Subject: [PATCH] properly fix utf-8 calendar --- include/functions.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/functions.inc.php b/include/functions.inc.php index d8f376c..2fb28ff 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -136,7 +136,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']) { @@ -162,7 +162,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); } -- 2.39.5