cvs: pear /Date/Date TimeZone.php
[email protected] ("Firman Wandayandi") Tue, 06 May 2008 15:08:22 -0000
| Newsgroups | php.pear.cvs |
|---|---|
| Message-ID | <cvsfirman1210086502@cvsserver> |
firman Tue May 6 15:08:22 2008 UTC
Modified files:
/pear/Date/Date TimeZone.php
Log:
Fixing bug #13615: Missing longname and dstlongname of America/Toronto in Timezone array
http://cvs.php.net/viewvc.cgi/pear/Date/Date/TimeZone.php?r1=1.33&r2=1.34&diff_format=u
Index: pear/Date/Date/TimeZone.php
diff -u pear/Date/Date/TimeZone.php:1.33 pear/Date/Date/TimeZone.php:1.34
--- pear/Date/Date/TimeZone.php:1.33 Sun Mar 23 18:34:16 2008
+++ pear/Date/Date/TimeZone.php Tue May 6 15:08:22 2008
@@ -38,7 +38,7 @@
* @copyright 1997-2007 Baba Buehler, Pierre-Alain Joye, C.A. Woodcock
* @license http://www.opensource.org/licenses/bsd-license.php
* BSD License
- * @version CVS: $Id: TimeZone.php,v 1.33 2008/03/23 18:34:16 c01234 Exp $
+ * @version CVS: $Id: TimeZone.php,v 1.34 2008/05/06 15:08:22 firman Exp $
* @link http://pear.php.net/package/Date
*/
@@ -328,7 +328,7 @@
$this->shortname = $_DATE_TIMEZONE_DATA[$ps_id]['shortname'];
$this->longname = $_DATE_TIMEZONE_DATA[$ps_id]['longname'];
$this->offset = $_DATE_TIMEZONE_DATA[$ps_id]['offset'];
- $this->dstshortname =
+ $this->dstshortname =
array_key_exists("dstshortname",
$_DATE_TIMEZONE_DATA[$ps_id]) ?
$_DATE_TIMEZONE_DATA[$ps_id]['dstshortname'] :
@@ -654,7 +654,7 @@
explode(" ",
Date_Calc::prevDayOfWeek($ha_daysofweek[$ha_matches[1]],
$hn_nmday,
- $hn_nextmonth,
+ $hn_nextmonth,
$hn_nmyear,
"%Y %m %d",
false)); // not including
@@ -829,7 +829,7 @@
*
* For example, if the clocks go forward at 1.00 standard time,
* then if the specified date/time is at 1.00, the function will
- * return true, although the correct local time will actually
+ * return true, although the correct local time will actually
* be 2.00.
*
* This function is reliable for all dates and times, unlike the
@@ -2910,6 +2910,8 @@
'offset' => -18000000,
'shortname' => 'EST',
'dstshortname' => 'EDT',
+ 'longname' => 'Eastern Standard Time',
+ 'dstlongname' => 'Eastern Daylight Time',
'summertimeoffset' => 3600000,
'summertimestartmonth' => 3,
'summertimestartday' => 'Sun>=8',