summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/libraries/Email.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index d8ab47281..4cd930892 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -602,7 +602,7 @@ class CI_Email {
$timezone = date("Z");
$operator = (substr($timezone, 0, 1) == '-') ? '-' : '+';
$timezone = abs($timezone);
- $timezone = ($timezone/3600) * 100 + ($timezone % 3600) /60;
+ $timezone = floor($timezone/3600) * 100 + ($timezone % 3600 ) / 60;
return sprintf("%s %s%04d", date("D, j M Y H:i:s"), $operator, $timezone);
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 2cb6e7c09..206480aa1 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -73,6 +73,7 @@ Change Log
<li>Documented unset_userdata in the <a href="./libraries/sessions.html">Session class</a>.</li>
<li>Changed the behaviour of custom callbacks so that they no longer trigger the &quot;required&quot; rule. </li>
<li>Added a few additional mime type variations for CSV.</li>
+ <li>Fixed a bug in the <a href="./libraries/email.html">Email</a> library where some timezones were calculated incorrectly. </li>
<li>Fixed a bug in <a href="./libraries/validation.html">Validation</a> where valid_ip() wasn't called properly.</li>
<li>Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space. </li>
<li>Fixed a bug in database driver where num_rows property wasn't getting updated.</li>