From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 5 May 2014 09:02:43 +0000 (+0400)
Subject: Merge branch 'master' into refactoring2
X-Git-Tag: POST_PHPNG_MERGE~412^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd4b4dfc4d661c0bb6f8bffc4c7d285194904e28;p=php

Merge branch 'master' into refactoring2

Conflicts:
	Zend/zend_hash.c
	ext/date/php_date.c
---

cd4b4dfc4d661c0bb6f8bffc4c7d285194904e28
diff --cc ext/date/php_date.c
index 439621f5e5,f81f87e4c9..31cb41adfd
--- 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);
  }