From: Sara Golemon <pollita@php.net>
Date: Fri, 20 Jun 2003 15:44:48 +0000 (+0000)
Subject: MFH (r-1.391) When skipping blank searchvals we should advance the corresponding... 
X-Git-Tag: php-4.3.3RC2~268
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35938e4d90765289d701a89c95b96843d150e5a6;p=php

MFH (r-1.391) When skipping blank searchvals we should advance the corresponding replace hash as well
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index de6a66b099..80897aa959 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2629,6 +2629,9 @@ static void php_str_replace_in_subject(zval *search, zval *replace, zval **subje
 			convert_to_string(*search_entry);
 			if (Z_STRLEN_PP(search_entry) == 0) {
 				zend_hash_move_forward(Z_ARRVAL_P(search));
+				if (Z_TYPE_P(replace) == IS_ARRAY) {
+					zend_hash_move_forward(Z_ARRVAL_P(replace));
+				}
 				continue;
 			}