From: Xinchen Hui <laruence@gmail.com>
Date: Sat, 27 May 2017 04:12:12 +0000 (+0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~43^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1838f965bc132ac4e7eea666d07c7eb0df7c9cc8;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Correct the location
---

1838f965bc132ac4e7eea666d07c7eb0df7c9cc8
diff --cc Zend/zend_API.c
index 323e10160d,43c6209ba4..8d5ef2b0b9
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -1155,11 -1157,12 +1155,10 @@@ ZEND_API int zend_update_class_constant
  				} ZEND_HASH_FOREACH_END();
  				ce = ce->parent;
  			}
 -
 -			*scope = old_scope;
  		}
+ 		class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
  	}
  
- 	class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
- 
  	return SUCCESS;
  }
  /* }}} */