Changeset 17811 for branches/version-2_4/data

Timestamp:

2009/02/19 15:10:16 (15 years ago)

Author:

kishida

Message:

#399 カレンダーブロックの定休日表示のバグ対応

File:

• branches/version-2_4/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php (modified) (3 diffs)

branches/version-2_4/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php

@@ -130 +130 @@
                 $arrCalendar[$j][$i]['month'] = $month;
                 $arrCalendar[$j][$i]['day'] = $Day->day;
-                if ($this->lfCheckHoliday($month, $Day->day)) {
+                if ($this->lfCheckHoliday($year, $month, $Day->day)) {
                     $arrCalendar[$j][$i]['holiday'] = true;
                 } else {
@@ -162 +162 @@
     }
     // 休日チェック
-    function lfCheckHoliday($month, $day) {
+    function lfCheckHoliday($year, $month, $day) {
         if (!empty($this->arrHoliday[$month])) {
             if (in_array($day, $this->arrHoliday[$month])) {
@@ -169 +169 @@
         }
         if (!empty($this->arrRegularHoliday)) {
-            $w = date('w', mktime(0,0,0 ,$month, $day, date('Y')));
+            $w = date('w', mktime(0,0,0 ,$month, $day, $year));
             if (in_array($w, $this->arrRegularHoliday)) {
                 return true;