From 171e31c0a61e59439ff7a09357c770061cc2dc09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20=C5=BDupan?= <zupan.chris@gmail.com>
Date: Thu, 27 Sep 2018 16:48:46 +0200
Subject: [PATCH] Product Attribute Ampersands fix

---
 .../Catalog/Controller/Adminhtml/Product/Attribute/Save.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index 84ad6d2116726..fc6f852d2563b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -330,6 +330,7 @@ private function preprocessOptionsData(&$data)
         if (isset($data['serialized_options'])) {
             $serializedOptions = json_decode($data['serialized_options'], JSON_OBJECT_AS_ARRAY);
             foreach ($serializedOptions as $serializedOption) {
+                $serializedOption = str_replace(array('&','+'), array('%26','%2B'), $serializedOption);
                 $option = [];
                 parse_str($serializedOption, $option);
                 $data = array_replace_recursive($data, $option);