MFH (r-1.391) When skipping blank searchvals we should advance the corresponding...

diff --git a/ext/standard/string.c b/ext/standard/string.c
index de6a66b099a0e7a163c7cb79464f1bd9c2c8ff67..80897aa9594db828eb497c90dddb21b920e333e1 100644 (file)
--- 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;
                        }