From 0e3b5b137c592ff661415e769d7de7a6de7a7bfd Mon Sep 17 00:00:00 2001
From: Arpad Ray <arpad@php.net>
Date: Mon, 29 Aug 2011 20:38:52 +0000
Subject: [PATCH] Fixed bug #55366: keys lost when using substr_replace an
 array

---
 NEWS                                          |  1 +
 ext/standard/string.c                         | 12 +++++++++++-
 .../tests/strings/substr_replace_array.phpt   | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 ext/standard/tests/strings/substr_replace_array.phpt

diff --git a/NEWS b/NEWS
index 0fabddb4363..01285567f9b 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ PHP                                                                        NEWS
     (virsacer at web dot de, Pierre)
   . Added support for SORT_NATURAL and SORT_FLAG_CASE in array sort functions:
     sort, rsort, ksort, krsort, asort, arsort and array_multisort. Req #55158 (arpad)
+  . Fixed bug #55366: keys lost when using substr_replace an array (arpad)
 
 - Improved mbstring extension:
   . Added Shift_JIS/UTF-8 Emoji (pictograms) support. (Rui)
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 62599d40196..dd436655252 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2398,6 +2398,10 @@ PHP_FUNCTION(substr_replace)
 			RETURN_STRINGL(Z_STRVAL_PP(str), Z_STRLEN_PP(str), 1);	
 		}
 	} else { /* str is array of strings */
+		char *str_index = NULL;
+		uint str_index_len;
+		ulong num_index;
+
 		array_init(return_value);
 
 		if (Z_TYPE_PP(from) == IS_ARRAY) {
@@ -2533,7 +2537,13 @@ PHP_FUNCTION(substr_replace)
 			}
 
 			result[result_len] = '\0';
-			add_next_index_stringl(return_value, result, result_len, 0);
+
+			if (zend_hash_get_current_key_ex(Z_ARRVAL_PP(str), &str_index, &str_index_len, &num_index, 0, &pos_str) == HASH_KEY_IS_STRING) {
+				add_assoc_stringl_ex(return_value, str_index, str_index_len, result, result_len, 0);
+			} else {
+				add_index_stringl(return_value, num_index, result, result_len, 0);
+			}
+
 			if(Z_TYPE_PP(tmp_str) != IS_STRING) {
 				zval_dtor(orig_str);
 			}
diff --git a/ext/standard/tests/strings/substr_replace_array.phpt b/ext/standard/tests/strings/substr_replace_array.phpt
new file mode 100644
index 00000000000..dbb8b171470
--- /dev/null
+++ b/ext/standard/tests/strings/substr_replace_array.phpt
@@ -0,0 +1,19 @@
+--TEST--
+substr_replace() function - array
+--FILE--
+<?php
+
+$arr = array('abc' => 'llsskdkk','def' => 'llsskjkkdd', 4 => 'hello', 42 => 'world');
+$newarr = substr_replace($arr, 'zzz', 0, -2);
+
+print_r($newarr);
+
+?>
+--EXPECTF--
+Array
+(
+    [abc] => zzzkk
+    [def] => zzzdd
+    [4] => zzzlo
+    [42] => zzzld
+)