moriyoshi Fri Feb 14 14:00:44 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard string.c
Log:
MFH(r1.358): Fixed a str_replace() bug similar to bug #22224
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.333.2.13 php4/ext/standard/string.c:1.333.2.14
--- php4/ext/standard/string.c:1.333.2.13 Fri Feb 14 13:44:50 2003
+++ php4/ext/standard/string.c Fri Feb 14 14:00:43 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.333.2.13 2003/02/14 18:44:50 moriyoshi Exp $ */
+/* $Id: string.c,v 1.333.2.14 2003/02/14 19:00:43 moriyoshi Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2621,7 +2621,8 @@
/* For each entry in the search array, get the entry */
while (zend_hash_get_current_data(Z_ARRVAL_P(search), (void **)
&search_entry) == SUCCESS) {
/* Make sure we're dealing with strings. */
- convert_to_string_ex(search_entry);
+ SEPARATE_ZVAL(search_entry);
+ convert_to_string(*search_entry);
if (Z_STRLEN_PP(search_entry) == 0) {
zend_hash_move_forward(Z_ARRVAL_P(search));
continue;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
