diff --git a/Model/Holiday.php b/Model/Holiday.php index 4d262be..de37395 100644 --- a/Model/Holiday.php +++ b/Model/Holiday.php @@ -93,12 +93,17 @@ public function isHoliday($date = null) { */ public function getHoliday($from, $to) { $holidays = $this->cacheFindQuery('all', array( + 'fields' => array( + 'Holiday.id', + 'Holiday.holiday', + 'Holiday.title' + ), 'conditions' => array( 'language_id' => Current::read('Language.id'), 'holiday >=' => $from, 'holiday <=' => $to ), - 'recursive' => 0, + 'recursive' => -1, 'order' => array('holiday') )); return $holidays; @@ -120,7 +125,15 @@ public function getHolidayInYear($year = null) { } $from = $year . '-01-01'; $to = $year . '-12-31'; - $holidays = $this->getHoliday($from, $to); + $holidays = $this->Find('all', array( + 'conditions' => array( + 'language_id' => Current::read('Language.id'), + 'holiday >=' => $from, + 'holiday <=' => $to + ), + 'recursive' => 0, + 'order' => array('holiday') + )); return $holidays; }