From: Felipe Pena <felipe@php.net>
Date: Mon, 8 Nov 2010 20:26:14 +0000 (+0000)
Subject: - Fix the fix (wrong behavior)
X-Git-Tag: php-5.4.0alpha1~191^2~711
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=590ad22361e7abd189abb3bf0a6ef67b90830046;p=php

- Fix the fix (wrong behavior)
---

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 5f48e9270d..7904662697 100755
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1795,7 +1795,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";
 }