diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-03-02 12:12:12 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-03-02 12:12:12 +0800 |
| commit | f4f140c05d739c46b6c482966b19652b6f4169ec (patch) | |
| tree | 0256a6cd1530d5b787e939d063d60925c9d56d9e | |
| parent | 565f6bd3742877ecd6f3030b4795d1d9893274eb (diff) | |
| parent | 2d4186dde758f0efee029a5d9e3363494e9ad168 (diff) | |
| download | php-git-f4f140c05d739c46b6c482966b19652b6f4169ec.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Use hash_exists_ind in symbol table
| -rw-r--r-- | Zend/zend_hash.h | 2 | ||||
| -rw-r--r-- | ext/standard/array.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index b1c9affb3c..866ee8663f 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -380,7 +380,7 @@ static zend_always_inline int zend_symtable_exists(HashTable *ht, zend_string *k if (ZEND_HANDLE_NUMERIC(key, idx)) { return zend_hash_index_exists(ht, idx); } else { - return zend_hash_exists(ht, key); + return zend_hash_exists_ind(ht, key); } } diff --git a/ext/standard/array.c b/ext/standard/array.c index 7356769e4c..3e9ecdfd46 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -5423,7 +5423,7 @@ PHP_FUNCTION(array_key_exists) switch (Z_TYPE_P(key)) { case IS_STRING: - if (zend_symtable_find_ind(array, Z_STR_P(key))) { + if (zend_symtable_exists(array, Z_STR_P(key))) { RETURN_TRUE; } RETURN_FALSE; |