MAGETWO-48511: [GitHub] HTML tags inside the Meta Description on Edit Product Admin page brake the Storefront PDP layout #1514 #2613 #3090 #3244 #3255 #3813 #4031 #4073

rganin · rganin · commit 1700f7c58d64 · 2016-04-21T13:50:59.000+03:00
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -216,7 +216,7 @@ public function getTitle()
     public function setMetadata($name, $content)
     {
         $this->build();
-        $this->metadata[$name] = $content;
+        $this->metadata[$name] = $this->prepareMetaTagContent($content);
     }
 
     /**
@@ -338,6 +338,17 @@ public function setKeywords($keywords)
         $this->setMetadata('keywords', $keywords);
     }
 
+    /**
+     * Prepare content for meta tag attribute
+     *
+     * @param $content
+     * @return string
+     */
+    protected function prepareMetaTagContent($content)
+    {
+        return htmlentities($content);
+    }
+
     /**
      * Retrieve content for keywords tag
      *

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ public function getTitle()`
`216`	`216`	`public function setMetadata($name, $content)`
`217`	`217`	`{`
`218`	`218`	`$this->build();`
`219`		`- $this->metadata[$name] = $content;`
	`219`	`+ $this->metadata[$name] = $this->prepareMetaTagContent($content);`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`/**`
`@@ -338,6 +338,17 @@ public function setKeywords($keywords)`
`338`	`338`	`$this->setMetadata('keywords', $keywords);`
`339`	`339`	`}`
`340`	`340`
	`341`	`+ /**`
	`342`	`+ * Prepare content for meta tag attribute`
	`343`	`+ *`
	`344`	`+ * @param $content`
	`345`	`+ * @return string`
	`346`	`+ */`
	`347`	`+ protected function prepareMetaTagContent($content)`
	`348`	`+ {`
	`349`	`+ return htmlentities($content);`
	`350`	`+ }`
	`351`	`+`
`341`	`352`	`/**`
`342`	`353`	`* Retrieve content for keywords tag`
`343`	`354`	`*`