diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-02-24 18:18:39 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-02-24 18:18:39 +0800 |
| commit | 5fccb0724b71e992b43ea92a4e27284c17d09063 (patch) | |
| tree | 0c09b30d7bf1910c65d8a156e032ccb9316b7d89 /Zend/zend_API.c | |
| parent | 57a3feb4225566ed9dda92d0e1e5c08c11a3448f (diff) | |
| parent | 73b8e9aef4206fdbd31c7df9da52b96ae78a9a1e (diff) | |
| download | php-git-5fccb0724b71e992b43ea92a4e27284c17d09063.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 23a9139c8e..00672c4564 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1619,8 +1619,9 @@ ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value) /* {{{ */ result = zend_symtable_update(ht, STR_EMPTY_ALLOC(), value); break; case IS_RESOURCE: - zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)", Z_LVAL_P(key), Z_LVAL_P(key)); - /* break missing intentionally */ + zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)", Z_RES_HANDLE_P(key), Z_RES_HANDLE_P(key)); + result = zend_hash_index_update(ht, Z_RES_HANDLE_P(key), value); + break; case IS_BOOL: case IS_LONG: result = zend_hash_index_update(ht, Z_LVAL_P(key), value); |