L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-60823 calendar: use first day of week on prepadding calc

Browse Source
This commit is contained in:
Simey Lameze
2017-11-20 12:08:30 +01:00
committed by David Monllao
parent 17ebd603e1
commit d692104051
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/classes/external/month_exporter.php
Vendored
+1 -2
View File
@@ -274,13 +274,12 @@ class month_exporter extends exporter {
// Calculate which day number is the first, and last day of the week.
$firstdayofweek = $this->firstdayofweek;
$lastdayofweek = ($firstdayofweek + $daysinweek - 1) % $daysinweek;
// The first week is special as it may have padding at the beginning.
$day = reset($alldays);
$firstdayno = $day['wday'];
$prepadding = ($firstdayno + $daysinweek - 1) % $daysinweek;
$prepadding = ($firstdayno + $daysinweek - $firstdayofweek) % $daysinweek;
$daysinfirstweek = $daysinweek - $prepadding;
$days = array_slice($alldays, 0, $daysinfirstweek);
$week = new week_exporter($this->calendar, $days, $prepadding, ($daysinweek - count($days) - $prepadding), $this->related);