Merge remote-tracking branch 'origin/MAGETWO-51643-config-special-symbols' into develop

Author: dsikkema-magento

app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php

@@ -148,7 +148,7 @@ public function getArrayRows()
             foreach ($element->getValue() as $rowId => $row) {
                 $rowColumnValues = [];
                 foreach ($row as $key => $value) {
-                    $row[$key] = $this->escapeHtml($value);
+                    $row[$key] = $value;
                     $rowColumnValues[$this->_getCellInputElementId($rowId, $key)] = $row[$key];
                 }
                 $row['_id'] = $rowId;

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FieldArray/AbstractTest.php

@@ -23,16 +23,16 @@ public function testGetArrayRows()
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $element = $objectManager->getObject('Magento\Framework\Data\Form\Element\Multiselect');
-        $element->setValue([['test' => 'test', 'data1' => 'data1']]);
+        $element->setValue([['te<s>t' => 't<e>st', 'data&1' => 'da&ta1']]);
         $block->setElement($element);
         $this->assertEquals(
             [
                 new \Magento\Framework\DataObject(
                     [
-                        'test' => 'test',
-                        'data1' => 'data1',
+                        'te<s>t' => 't<e>st',
+                        'data&1' => 'da&ta1',
                         '_id' => 0,
-                        'column_values' => ['0_test' => 'test', '0_data1' => 'data1'],
+                        'column_values' => ['0_te<s>t' => 't<e>st', '0_data&1' => 'da&ta1'],
                     ]
                 ),
             ],