com php-src: Merge branch 'PHP-7.4': ext/mbstring/mbstring.c ext/spl/spl_iterators.c
| From: | Nikita Popov | Date: | Fri, 22 Mar 2019 09:30:15 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': ext/mbstring/mbstring.c ext/spl/spl_iterators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105297@lists.php.net to get a copy of this message | ||
Commit: d7348cd2b4b9d8dbe1e9da301f2100fabc227431
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 22 Mar 2019 10:30:15 +0100
Parents: e86cdce549c9e81847584d2caa2dff7f89eac682 e7e2056d1a993a01c9d57fb2261066855d282d8f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d7348cd2b4b9d8dbe1e9da301f2100fabc227431
Log:
Merge branch 'PHP-7.4'
Changed paths:
MM ext/mbstring/mbstring.c
MM ext/spl/spl_iterators.c
Diff:
diff --cc ext/spl/spl_iterators.c
index 8af52bb,5696077..abe137f
--- a/ext/spl/spl_iterators..c
+++ b/ext/spl/spl_iterators.c
@@@ -2221,11 -2259,9 +2218,9 @@@ SPL_METHOD(RecursiveRegexIterator, acce
RETURN_BOOL(zend_hash_num_elements(Z_ARRVAL(intern->current.data)) > 0);
}
- zend_call_method_with_0_params(ZEND_THIS, spl_ce_RegexIterator, NULL, "accept",
return_value);
+ zend_call_method_with_0_params(Z_OBJ_P(ZEND_THIS), spl_ce_RegexIterator, NULL,
"accept", return_value);
}
- #endif
-
/* {{{ spl_dual_it_dtor */
static void spl_dual_it_dtor(zend_object *_object)
{