diff options
| author | Timm Friebe <thekid@thekid.de> | 2014-07-06 17:07:01 +0200 |
|---|---|---|
| committer | Timm Friebe <thekid@thekid.de> | 2014-07-06 17:07:01 +0200 |
| commit | a1554ca6343598c38e4fb4fbcc46419ce0bdf058 (patch) | |
| tree | e66e73ff23a340cf7343459a0331a57b8eff65aa /ext/spl/spl_iterators.c | |
| parent | e0d51d1cf00d43c57104764b620bb9219889a86d (diff) | |
| parent | 5b925824edf3edc951fc41608d5cbd07a0baab08 (diff) | |
| download | php-git-a1554ca6343598c38e4fb4fbcc46419ce0bdf058.tar.gz | |
Merge in changes from master
Now also includes "on [TYPE]" in "Call to a member function" error
Diffstat (limited to 'ext/spl/spl_iterators.c')
| -rw-r--r-- | ext/spl/spl_iterators.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 3068ccc795..b9901f8f27 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -848,6 +848,8 @@ static union _zend_function *spl_recursive_it_get_method(zval **object_ptr, char *object_ptr = zobj; function_handler = Z_OBJ_HT_P(*object_ptr)->get_method(object_ptr, method, method_len, key TSRMLS_CC); } + } else { + *object_ptr = zobj; } } return function_handler; |