| @@ -44,9 +44,9 @@ | ||
| 44 | 44 | protected $_weekdays = array(); |
| 45 | 45 | |
| 46 | 46 | var $timezone = ''; |
| 47 | 47 | |
| 48 | - function __construct( ?HC3_Settings $settings = NULL ) | |
| 48 | + function __construct( HC3_Settings $settings = NULL ) | |
| 49 | 49 | { |
| 50 | 50 | parent::__construct(); |
| 51 | 51 | |
| 52 | 52 | $localiseThis = array('__Jan__', '__Feb__', '__Mar__', '__Apr__', '__May__', '__Jun__', '__Jul__', '__Aug__', '__Sep__', '__Oct__', '__Nov__', '__Dec__'); |
| @@ -577,9 +577,9 @@ | ||
| 577 | 577 | |
| 578 | 578 | return $return; |
| 579 | 579 | } |
| 580 | 580 | |
| 581 | - public function getMonthMatrix( $skipWeekdays = array(), $daysPerWeek = 7 ) | |
| 581 | + public function getMonthMatrix( $skipWeekdays = array() ) | |
| 582 | 582 | { |
| 583 | 583 | $overlap = TRUE; // if to show dates of prev/next month |
| 584 | 584 | $overlap = FALSE; // if to show dates of prev/next month |
| 585 | 585 | |
| @@ -617,9 +617,9 @@ | ||
| 617 | 617 | $this->setDateDb( $rexDate ); |
| 618 | 618 | while( $rexDate <= $endDate ){ |
| 619 | 619 | $week = array(); |
| 620 | 620 | $weekSet = FALSE; |
| 621 | - for( $weekDay = 0; $weekDay < $daysPerWeek; $weekDay++ ){ | |
| 621 | + for( $weekDay = 0; $weekDay <= 6; $weekDay++ ){ | |
| 622 | 622 | $thisWeekday = $this->getWeekday(); |
| 623 | 623 | $setDate = $rexDate; |
| 624 | 624 | |
| 625 | 625 | if( ! $overlap ){ |
