Changeset 17713
- Timestamp:
- 2008/12/01 12:16:57 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/comu-ver2/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
r17623 r17713 130 130 $arrCalendar[$j][$i]['month'] = $month; 131 131 $arrCalendar[$j][$i]['day'] = $Day->day; 132 if ($this->lfCheckHoliday($month, $Day->day)) { 132 #if ($this->lfCheckHoliday($month, $Day->day) || $Day->first || $Day->last) { 133 if ($this->lfCheckHoliday($year, $month, $Day->day)) { 133 134 $arrCalendar[$j][$i]['holiday'] = true; 134 135 } else { … … 162 163 } 163 164 165 164 166 // 休日チェック 165 function lfCheckHoliday($ month, $day) {167 function lfCheckHoliday($year, $month, $day) { 166 168 if (!empty($this->arrHoliday[$month])) { 167 169 if (in_array($day, $this->arrHoliday[$month])) { … … 170 172 } 171 173 if (!empty($this->arrRegularHoliday)) { 172 $w = date('w', mktime(0,0,0 ,$month, $day, date('Y')));174 $w = date('w', mktime(0,0,0 ,$month, $day, $year)); 173 175 if (in_array($w, $this->arrRegularHoliday)) { 174 176 return true;
Note: See TracChangeset
for help on using the changeset viewer.