From d5260bab0d4ef39fa4e9d8d2a026fcef2edae9d9 Mon Sep 17 00:00:00 2001 From: conory Date: Sun, 7 Feb 2016 18:30:53 +0900 Subject: [PATCH] =?UTF-8?q?zdate()=EC=97=90=EC=84=9C=20=EC=9E=98=EB=AA=BB?= =?UTF-8?q?=EB=90=9C=20=EB=B0=B0=EC=97=B4=EC=B2=98=EB=A6=AC=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B8=ED=95=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/legacy.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/legacy.php b/common/legacy.php index 82ddabc8b..6f29930e7 100644 --- a/common/legacy.php +++ b/common/legacy.php @@ -630,7 +630,7 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = TRUE) { $format = $convtable[$lang_type][$format]; } - elseif(isset($convtable[$convtable[$lang_type]][$format])) + elseif(is_string($convtable[$lang_type]) && isset($convtable[$convtable[$lang_type]][$format])) { $format = $convtable[$convtable[$lang_type]][$format]; } @@ -643,8 +643,8 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = TRUE) // change day and am/pm for each language if(preg_match('/[MFAa]/', $format)) { - $unit_week = Context::getLang('unit_week'); - $unit_meridiem = Context::getLang('unit_meridiem'); + $unit_week = (Array)Context::getLang('unit_week'); + $unit_meridiem = (Array)Context::getLang('unit_meridiem'); $string = str_replace(array('Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'), $unit_week, $string); $string = str_replace(array('am', 'pm', 'AM', 'PM'), $unit_meridiem, $string); }