Merge remote-tracking branch '38510/patch-4' into commpr-10131-1706

Author: del10131

app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml

@@ -1,24 +1,27 @@
 <?php
 /**
- * Copyright 2014 Adobe
+ * Copyright 2011 Adobe
  * All Rights Reserved.
  */
 
 /** @var $block \Magento\Catalog\Block\Product\View */
+/** @var $escaper \Magento\Framework\Escaper */
+
+$product = $block->getProduct();
 ?>
 
 <meta property="og:type" content="product" />
 <meta property="og:title"
-      content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())) ?>" />
+      content="<?= $escaper->escapeHtmlAttr($block->stripTags($product->getName())) ?>" />
 <meta property="og:image"
-      content="<?= $block->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>" />
+      content="<?= $escaper->escapeUrl($block->getImage($product, 'product_base_image')->getImageUrl()) ?>" />
 <meta property="og:description"
-      content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
-<meta property="og:url" content="<?= $block->escapeUrl($block->getProduct()->getProductUrl()) ?>" />
-<?php if ($priceAmount = $block->getProduct()
+      content="<?= $escaper->escapeHtmlAttr($block->stripTags($product->getShortDescription())) ?>" />
+<meta property="og:url" content="<?= $escaper->escapeUrl($product->getProductUrl()) ?>" />
+<?php if ($product->getCanShowPrice() !== false && $priceAmount = $product
           ->getPriceInfo()
           ->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)
           ->getAmount()):?>
-    <meta property="product:price:amount" content="<?= $block->escapeHtmlAttr($priceAmount) ?>"/>
+    <meta property="product:price:amount" content="<?= $escaper->escapeHtmlAttr($priceAmount) ?>"/>
     <?= $block->getChildHtml('meta.currency') ?>
 <?php endif;?>