Changeset 17713


Ignore:
Timestamp:
2008/12/01 12:16:57 (12 years ago)
Author:
Yammy
Message:

カレンダーブロックの定休日表示のバグ 修正
http://svn.ec-cube.net/open_trac/ticket/399

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/comu-ver2/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php

    r17623 r17713  
    130130                $arrCalendar[$j][$i]['month'] = $month; 
    131131                $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)) { 
    133134                    $arrCalendar[$j][$i]['holiday'] = true; 
    134135                } else { 
     
    162163    } 
    163164 
     165 
    164166    // 休日チェック 
    165     function lfCheckHoliday($month, $day) { 
     167    function lfCheckHoliday($year, $month, $day) { 
    166168        if (!empty($this->arrHoliday[$month])) { 
    167169            if (in_array($day, $this->arrHoliday[$month])) { 
     
    170172        } 
    171173        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)); 
    173175            if (in_array($w, $this->arrRegularHoliday)) { 
    174176                return true; 
Note: See TracChangeset for help on using the changeset viewer.