AC-9883: Fix Catalog System Config

Author: sreenia806

lib/internal/Magento/Framework/Data/Form/Element/Image.php

@@ -71,30 +71,27 @@ public function getElementHtml()
     {
         $html = '';
 
-        if ((string)$this->getValue()) {
+        if ((string)$this->getEscapedValue()) {
             $url = $this->_getUrl();
 
             if (!preg_match("/^http\:\/\/|https\:\/\//", $url)) {
                 $url = $this->_urlBuilder->getBaseUrl(['_type' => UrlInterface::URL_TYPE_MEDIA]) . $url;
             }
 
             $linkId = 'linkId' .$this->random->getRandomString(8);
-            $html = '<a previewlinkid="' .$linkId .'" href="' .
-                $url .
-                '" ' .
+            $html = '<a previewlinkid="' .$linkId  .'" href="' .
+                $url . '" ' .
                 $this->_getUiId(
                     'link'
                 ) .
                 '>' .
-                '<img src="' .
-                $url .
-                '" id="' .
+                '<img src="' . $url . '" id="' .
                 $this->getHtmlId() .
                 '_image" title="' .
-                $this->getValue() .
+                $this->getEscapedValue() .
                 '"' .
                 ' alt="' .
-                $this->getValue() .
+                $this->getEscapedValue() .
                 '" height="22" width="22" class="small-image-preview v-middle"  ' .
                 $this->_getUiId() .
                 ' />' .
@@ -120,7 +117,7 @@ public function getElementHtml()
     protected function _getDeleteCheckbox()
     {
         $html = '';
-        if ($this->getValue()) {
+        if ($this->getEscapedValue()) {
             $label = (string)new \Magento\Framework\Phrase('Delete Image');
             $html .= '<span class="delete-image">';
             $html .= '<input type="checkbox"' .
@@ -153,7 +150,8 @@ protected function _getDeleteCheckbox()
      */
     protected function _getHiddenInput()
     {
-        return '<input type="hidden" name="' . parent::getName() . '[value]" value="' . $this->getValue() . '" />';
+        return '<input type="hidden" name="' . parent::getName() .
+            '[value]" value="' . $this->getEscapedValue() . '" />';
     }
 
     /**
@@ -163,7 +161,7 @@ protected function _getHiddenInput()
      */
     protected function _getUrl()
     {
-        return $this->getValue();
+        return $this->getEscapedValue();
     }
 
     /**