[PHP-CVS] cvs: php-src /ext/standard string.c

[Rolland Santimano]

rolland         Fri Sep 30 09:19:19 2005 EDT

  Modified files:              
    /php-src/ext/standard       string.c 
  Log:
  - substr_replace(): call correct funcn for string conversion
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.488&r2=1.489&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.488 php-src/ext/standard/string.c:1.489
--- php-src/ext/standard/string.c:1.488 Thu Sep 29 07:05:30 2005
+++ php-src/ext/standard/string.c       Fri Sep 30 09:19:15 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.488 2005/09/29 11:05:30 rolland Exp $ */
+/* $Id: string.c,v 1.489 2005/09/30 13:19:15 rolland Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -2800,11 +2800,11 @@
                        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 @@
                        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);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php