From 22f7998a0d527b9f7116e780f2658afa6faf9550 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Mon, 8 Nov 2010 20:26:14 +0000 Subject: [PATCH] - Fix the fix (wrong behavior) --- ext/spl/spl_iterators.c | 2 +- ext/spl/tests/bug50579.phpt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index dc6f17bac0..9c1750b219 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1796,7 +1796,7 @@ SPL_METHOD(RegexIterator, accept) break; case REGIT_MODE_REPLACE: - replacement = zend_read_property(intern->std.ce, intern->inner.zobject, "replacement", sizeof("replacement")-1, 1 TSRMLS_CC); + replacement = zend_read_property(intern->std.ce, getThis(), "replacement", sizeof("replacement")-1, 1 TSRMLS_CC); result = php_pcre_replace_impl(intern->u.regex.pce, subject, subject_len, replacement, 0, &result_len, -1, &count TSRMLS_CC); if (intern->u.regex.flags & REGIT_USE_KEY) { diff --git a/ext/spl/tests/bug50579.phpt b/ext/spl/tests/bug50579.phpt index 3045228ef0..e32262a743 100644 --- a/ext/spl/tests/bug50579.phpt +++ b/ext/spl/tests/bug50579.phpt @@ -9,23 +9,23 @@ class foo extends ArrayIterator { 'test1'=>'test888', 'test2'=>'what?', 'test3'=>'test999')); - $this->replacement = '[$1]'; } } $h = new foo; $i = new RegexIterator($h, '/^test(.*)/', RegexIterator::REPLACE); -$h->replacement = '[$0]'; +$i->replacement = '[$0]'; foreach ($i as $name=>$value) { echo $name . '=>' . $value . "\n"; } -$h->replacement = '$1'; +$i->replacement = '$1'; foreach ($i as $name=>$value) { echo $name . '=>' . $value . "\n"; } $h = new foo; $i = new RegexIterator($h, '/^test(.*)/', RegexIterator::REPLACE); +$i->replacement = '[$1]'; foreach ($i as $name=>$value) { echo $name . '=>' . $value . "\n"; } -- 2.40.0