com php-src: Merge branch 'master' into refactoring2: Zend/zend.c ext/curl/interface.c ext/date/php_date.c ext/mysqli/mysql i_nonapi.c
ext/pdo_firebird/firebird_driver.c ext /standard/html.c

Commit: cd4b4dfc4d661c0bb6f8bffc4c7d285194904e28 Author: Dmitry Stogov <dmitry@zend.com> Mon, 5 May 2014 13:02:43 +0400 Parents: 83d45d0a04e3cca8282911c8a384a73297f7375f 149568f4da75a148d6ca71073b353f0d5f8f477a Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cd4b4dfc4d661c0bb6f8bffc4c7d285194904e28 Log: Merge branch 'master' into refactoring2 Conflicts: Zend/zend_hash..c ext/date/php_date.c Changed paths: MM Zend/zend.c MM ext/curl/interface.c MM ext/date/php_date.c MM ext/mysqli/mysqli_nonapi.c MM ext/pdo_firebird/firebird_driver.c MM ext/standard/html.c Diff: diff --cc ext/date/php_date.c index 439621f,f81f87e...31cb41a --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@@ -2680,7 -2729,9 +2680,9 @@@ PHP_METHOD(DateTime, __construct zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) { - php_date_initialize(Z_PHPDATE_P(getThis()), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC); - if (!php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC)) { - ZVAL_NULL(getThis()); ++ if (!php_date_initialize(Z_PHPDATE_P(getThis()), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC)) { ++//??? ZVAL_NULL(getThis()); + } } zend_restore_error_handling(&error_handling TSRMLS_CC); }