diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-11-27 14:39:40 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-11-27 14:39:40 +0400 |
| commit | 92b76680e9489d1872e4a29cefd98d28cfb7409a (patch) | |
| tree | e42c3da691f0755bcdf8ccaa3edc73423e43fd53 /Zend/zend_execute.c | |
| parent | e9c6a1cfd21b784033cf40248464021a68aaa380 (diff) | |
| parent | 16d59aa1718324ff0d4bea62fa9dfc3d4c8b16ce (diff) | |
| download | php-git-92b76680e9489d1872e4a29cefd98d28cfb7409a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #65969 (Chain assignment with T_LIST failure)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index a65f5331de..f1ec47f73b 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1247,9 +1247,8 @@ convert_to_array: } } -static void zend_fetch_dimension_address_read(temp_variable *result, zval **container_ptr, zval *dim, int dim_type, int type TSRMLS_DC) +static void zend_fetch_dimension_address_read(temp_variable *result, zval *container, zval *dim, int dim_type, int type TSRMLS_DC) { - zval *container = *container_ptr; zval **retval; switch (Z_TYPE_P(container)) { |