summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2017-05-27 12:12:17 +0800
committerXinchen Hui <laruence@gmail.com>2017-05-27 12:12:17 +0800
commit225f6cc11fc1d4906c574e2c9ee8c86cf9dae77b (patch)
treec423fec675341141ce336655b36d2ebd1ce6ae30
parent8af21f3ca67042e606ca09a354041b38ca1ad5e5 (diff)
parent1838f965bc132ac4e7eea666d07c7eb0df7c9cc8 (diff)
downloadphp-git-225f6cc11fc1d4906c574e2c9ee8c86cf9dae77b.tar.gz
Merge branch 'PHP-7.1'
* PHP-7.1: Correct the location
-rw-r--r--Zend/zend_API.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 78985a777a..b7cc405a05 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1186,10 +1186,9 @@ ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */
ce = ce->parent;
}
}
+ class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
}
- class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
-
return SUCCESS;
}
/* }}} */