]> granicus.if.org Git - php/commitdiff
- Let's keep this consistent in the whole file.
authorDerick Rethans <derick@php.net>
Tue, 25 Jan 2011 15:08:19 +0000 (15:08 +0000)
committerDerick Rethans <derick@php.net>
Tue, 25 Jan 2011 15:08:19 +0000 (15:08 +0000)
ext/date/php_date.c

index 1d6bbefe0c4914cf8dcac79b0b65ea6e09e20c82..a68077dc7abb291e5adf1448bbd6272b56565ecd 100644 (file)
@@ -897,7 +897,7 @@ static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC)
                                }
                                
                                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));