Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117 from marc1706/calendar/one_day_off

Browse Source 
Display correct day of the week with negative UTC offset
This commit is contained in:
Marc Alexander
2013-02-27 08:28:32 -08:00
parent e40a5e97a6 e33f13f8fb
commit 2d0e98b83c
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
root/portal/modules/portal_calendar.php
View File

@@ -125,7 +125,7 @@ class portal_calendar_module
)); ));
// output the days for the current month // output the days for the current month
for($i=0; $i < $mini_cal_month_days;) for($i = 0; $i < $mini_cal_month_days;)
{ {
// is this the first day of the week? // is this the first day of the week?
if($mini_cal_count == $this->mini_cal_fdow) if($mini_cal_count == $this->mini_cal_fdow)
@@ -577,9 +577,7 @@ class portal_calendar_module
**/ **/
private function makeTimestamp($date) private function makeTimestamp($date)
{ {
global $user; $this->stamp = (empty($this->stamp)) ? strtotime($date) : $this->stamp;
$this->stamp = (empty($this->stamp)) ? strtotime($date) + $user->timezone + $user->dst : $this->stamp;
return ($this->stamp); return ($this->stamp);
} }
@@ -630,14 +628,14 @@ class portal_calendar_module
$this->dateDD = date("d", $this->stamp); $this->dateDD = date("d", $this->stamp);
$this->daysMonth = date("t", $this->stamp); $this->daysMonth = date("t", $this->stamp);
for ($i=1; $i < $this->daysMonth + 1; $i++) for ($i = 1; $i < $this->daysMonth + 1; $i++)
{ {
$this->makeTimestamp("$i $this->ext_dateMM $this->dateYYYY"); $this->makeTimestamp("$i {$this->ext_dateMM} {$this->dateYYYY}");
$this->day[] = array( $this->day[] = array(
"0" => "$i", '0' => "$i",
"1" => $this->dateMM, '1' => $this->dateMM,
"2" => $this->dateYYYY, '2' => $this->dateYYYY,
"3" => (date('w', $this->stamp)) '3' => date('w', $this->stamp)
); );
} }
} }