pollita Fri Jun 20 11:44:48 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard string.c
Log:
MFH (r-1.391) When skipping blank searchvals we should advance the corresponding
replace hash as well
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.333.2.30 php4/ext/standard/string.c:1.333.2.31
--- php4/ext/standard/string.c:1.333.2.30 Tue Jun 10 22:16:49 2003
+++ php4/ext/standard/string.c Fri Jun 20 11:44:48 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.333.2.30 2003/06/11 02:16:49 iliaa Exp $ */
+/* $Id: string.c,v 1.333.2.31 2003/06/20 15:44:48 pollita Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2629,6 +2629,9 @@
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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
