Commit: f6000a01e286f855a7f40fcad738a1f9b00aa81e Author: Xinchen Hui <larue...@php.net> Tue, 11 Sep 2012 18:09:47 +0800 Parents: 79e6635cb66a9efd47d48012bafe00f2897b0814 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f6000a01e286f855a7f40fcad738a1f9b00aa81e Log: Capitalize the warning message Changed paths: M ext/date/php_date.c M ext/date/tests/date_default_timezone_get-4.phpt Diff: diff --git a/ext/date/php_date.c b/ext/date/php_date.c index e43ff19..765da9e 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -864,7 +864,7 @@ static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC) return DATEG(default_timezone); } /* Invalid date.timezone value */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "date.timezone value '%s' is invalid. We selected the timezone 'UTC' for now.", DATEG(default_timezone)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid date.timezone value '%s', we selected the timezone 'UTC' for now.", DATEG(default_timezone)); } else { /* No date.timezone value */ php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone."); diff --git a/ext/date/tests/date_default_timezone_get-4.phpt b/ext/date/tests/date_default_timezone_get-4.phpt index e76d4e3..6d1982b 100644 --- a/ext/date/tests/date_default_timezone_get-4.phpt +++ b/ext/date/tests/date_default_timezone_get-4.phpt @@ -7,5 +7,5 @@ date.timezone=Incorrect/Zone echo date_default_timezone_get(), "\n"; ?> --EXPECTF-- -Warning: date_default_timezone_get(): date.timezone value 'Incorrect/Zone' is invalid. We selected the timezone 'UTC' for now. in %sdate_default_timezone_get-4.php on line %d +Warning: date_default_timezone_get(): Invalid date.timezone value 'Incorrect/Zone', we selected the timezone 'UTC' for now. in %sdate_default_timezone_get-4.php on line %d UTC -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
