Skip to content

Commit

Permalink
Display correct day of the week with negative UTC offset
Browse files Browse the repository at this point in the history
A duplicate subtraction of the UTC offset and DST time caused the creation
of an incorrect timestamp. In return this caused us to go back too far and
therefore moved us back one day.
  • Loading branch information
marc1706 committed Feb 15, 2013
1 parent 58aa861 commit 36903cb
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions root/portal/modules/portal_calendar.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public function get_template_side($module_id)
));

// 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?
if($mini_cal_count == $this->mini_cal_fdow)
Expand Down Expand Up @@ -576,7 +576,7 @@ private function makeTimestamp($date)
{
global $user;

$this->stamp = strtotime($date) + $user->timezone + $user->dst;
$this->stamp = strtotime($date);
return ($this->stamp);
}

Expand Down Expand Up @@ -627,14 +627,14 @@ private function getMonth($callDate)
$this->dateDD = date("d", $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(
"0" => "$i",
"1" => $this->dateMM,
"2" => $this->dateYYYY,
"3" => (date('w', $this->stamp))
'0' => "$i",
'1' => $this->dateMM,
'2' => $this->dateYYYY,
'3' => date('w', $this->stamp)
);
}
}
Expand Down

0 comments on commit 36903cb

Please sign in to comment.