From: Rolland Santimano <rolland@php.net>
Date: Fri, 30 Sep 2005 13:19:15 +0000 (+0000)
Subject: - substr_replace(): call correct funcn for string conversion
X-Git-Tag: RELEASE_0_9_0~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2dc1c729173d1ed6d995ea2c3adb4a8411aec804;p=php

- substr_replace(): call correct funcn for string conversion
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index c9840a7d5f..e867e188d0 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2800,11 +2800,11 @@ PHP_FUNCTION(substr_replace)
 			if (tmp_repl && Z_TYPE_PP(str) != Z_TYPE_PP(tmp_repl)) {
 				str_type = zend_get_unified_string_type(2 TSRMLS_CC, Z_TYPE_PP(str), Z_TYPE_PP(tmp_repl));
 				if (str_type == (zend_uchar)-1) {
-					convert_to_explicit_type(str, IS_BINARY);
-					convert_to_explicit_type(tmp_repl, IS_BINARY);
+					convert_to_explicit_type_ex(str, IS_BINARY);
+					convert_to_explicit_type_ex(tmp_repl, IS_BINARY);
 				} else {
-					convert_to_explicit_type(str, str_type);
-					convert_to_explicit_type(tmp_repl, str_type);
+					convert_to_explicit_type_ex(str, str_type);
+					convert_to_explicit_type_ex(tmp_repl, str_type);
 				}
 			}
 			php_adjust_limits(str, &f, &l);
@@ -2881,11 +2881,11 @@ PHP_FUNCTION(substr_replace)
 			if (tmp_repl && Z_TYPE_PP(tmp_str) != Z_TYPE_PP(tmp_repl)) {
 				str_type = zend_get_unified_string_type(2 TSRMLS_CC, Z_TYPE_PP(tmp_str), Z_TYPE_PP(tmp_repl));
 				if (str_type == (zend_uchar)-1) {
-					convert_to_explicit_type(tmp_str, IS_BINARY);
-					convert_to_explicit_type(tmp_repl, IS_BINARY);
+					convert_to_explicit_type_ex(tmp_str, IS_BINARY);
+					convert_to_explicit_type_ex(tmp_repl, IS_BINARY);
 				} else {
-					convert_to_explicit_type(tmp_str, str_type);
-					convert_to_explicit_type(tmp_repl, str_type);
+					convert_to_explicit_type_ex(tmp_str, str_type);
+					convert_to_explicit_type_ex(tmp_repl, str_type);
 				}
 			}
 			php_adjust_limits(tmp_str, &f, &l);