..F....... [ZBX-19255] fixed update of http headers fields in item and item prototype mass update form

1 files changed, 10 insertions, 3 deletions

diff --git a/ui/app/controllers/CControllerPopupMassupdateItem.php b/ui/app/controllers/CControllerPopupMassupdateItem.php
index 2a5238468ca..6ff7d38ae3f 100644
--- a/ui/app/controllers/CControllerPopupMassupdateItem.php
+++ b/ui/app/controllers/CControllerPopupMassupdateItem.php
@@ -255,10 +255,17 @@ class CControllerPopupMassupdateItem extends CController {
 			}
 
 			if (array_key_exists('headers', $input) && $input['headers']) {
-				$headers = (count($input['headers']['name']) == count($input['headers']['value']))
-					? array_combine($input['headers']['name'], $input['headers']['value'])
+				$headers = [];
+				foreach ($input['headers']['name'] as $i => $header_name) {
+					if (array_key_exists($i, $input['headers']['value'])) {
+						$headers[$header_name] = $input['headers']['value'][$i];
+					}
+				}
+
+				// Ignore single row if it is empty.
+				$input['headers'] = ($headers !== ['' => ''])
+					? $headers
 					: [];
-				$input['headers'] = array_filter($headers, 'strlen');
 			}
 
 			if (array_key_exists('preprocessing', $input) && $input['preprocessing']) {