MFH(r-1.399): simplification

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 884f3616426a2d00f22eae9ed40b24540ccd27be..be5e2737212c1116babc8fcb334afdfcec0127d9 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2746,10 +2746,9 @@ PHP_FUNCTION(str_replace)
                                SEPARATE_ZVAL(subject_entry);
                                php_str_replace_in_subject(*search, *replace, subject_entry, result);
                        } else {
-                               MAKE_STD_ZVAL(result);
-                               SEPARATE_ZVAL(subject_entry);
-                               *result = **subject_entry;
-                               zval_copy_ctor(result);
+                               ALLOC_ZVAL(result);
+                               ZVAL_ADDREF(*subject_entry);
+                               COPY_PZVAL_TO_ZVAL(*result, *subject_entry);
                        }
                        /* Add to return array */
                        switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(subject), &string_key,