From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 25 Feb 2014 11:23:06 +0000 (+0400)
Subject: Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
X-Git-Tag: POST_PHPNG_MERGE~412^2~533
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b965647e44c4574ba4c22bfc92b5b7f587451c9d;p=php

Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2

Conflicts:
	Zend/zend_object_handlers.c
---

b965647e44c4574ba4c22bfc92b5b7f587451c9d
diff --cc Zend/zend_object_handlers.c
index 1f9d5f24d0,98b19f6b44..48f1bc641a
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@@ -100,7 -102,7 +102,7 @@@ ZEND_API void rebuild_object_properties
  					    prop_info->offset >= 0 &&
  						Z_TYPE(zobj->properties_table[prop_info->offset]) != IS_UNDEF) {
  						zval *zv = zend_hash_add(zobj->properties, prop_info->name, &zobj->properties_table[prop_info->offset]);
- 						if (zv) {
 -						if (EXPECTED(zv)) {
++						if (EXPECTED(zv != NULL)) {
  							ZVAL_INDIRECT(&zobj->properties_table[prop_info->offset], zv);
  						}
  					}