derick                                   Tue, 25 Jan 2011 15:08:19 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=307735

Log:
- Let's keep this consistent in the whole file.

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/date/php_date.c
    U   php/php-src/trunk/ext/date/php_date.c

Modified: php/php-src/branches/PHP_5_3/ext/date/php_date.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/date/php_date.c    2011-01-25 14:59:24 UTC 
(rev 307734)
+++ php/php-src/branches/PHP_5_3/ext/date/php_date.c    2011-01-25 15:08:19 UTC 
(rev 307735)
@@ -897,7 +897,7 @@
                                }

                                tzid = timelib_timezone_id_from_abbr("", 
(tzi.Bias + tzi.DaylightBias) * -60, 1);
-                               if (tzid == NULL) {
+                               if (! tzid) {
                                        tzid = "UTC";
                                }
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, 
DATE_TZ_ERRMSG "We selected '%s' for '%.1f/DST' instead", tzid, ((tzi.Bias + 
tzi.DaylightBias) / -60.0));

Modified: php/php-src/trunk/ext/date/php_date.c
===================================================================
--- php/php-src/trunk/ext/date/php_date.c       2011-01-25 14:59:24 UTC (rev 
307734)
+++ php/php-src/trunk/ext/date/php_date.c       2011-01-25 15:08:19 UTC (rev 
307735)
@@ -897,7 +897,7 @@
                                }

                                tzid = timelib_timezone_id_from_abbr("", 
(tzi.Bias + tzi.DaylightBias) * -60, 1);
-                               if (tzid == NULL) {
+                               if (! tzid) {
                                        tzid = "UTC";
                                }
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, 
DATE_TZ_ERRMSG "We selected '%s' for '%.1f/DST' instead", tzid, ((tzi.Bias + 
tzi.DaylightBias) / -60.0));

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to