Merge branch 'MC-17511' of github.com:magento-performance/magento2ce into 2.3-develop

slopukhov · slopukhov · commit 3a20fc289042 · 2019-06-18T13:29:02.000-05:00
diff --git a/app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php b/app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php
@@ -41,7 +41,7 @@ public function beforeSendResponse(Http $subject): void
     {
         $content = $subject->getContent();
 
-        if (strpos($content, '</body') !== false && $this->scopeConfig->isSetFlag(
+        if (\is_string($content) && strpos($content, '</body') !== false && $this->scopeConfig->isSetFlag(
             self::XML_PATH_USE_CSS_CRITICAL_PATH,
             ScopeInterface::SCOPE_STORE
         )) {
diff --git a/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml b/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml
@@ -10,11 +10,6 @@
         <css src="css/styles-m.css"/>
         <css src="css/styles-l.css" media="screen and (min-width: 768px)"/>
         <css src="css/print.css" media="print"/>
-        <font src="fonts/opensans/light/opensans-300.woff2"/>
-        <font src="fonts/opensans/regular/opensans-400.woff2"/>
-        <font src="fonts/opensans/semibold/opensans-600.woff2"/>
-        <font src="fonts/opensans/bold/opensans-700.woff2"/>
-        <font src="fonts/Luma-Icons.woff2"/>
         <meta name="format-detection" content="telephone=no"/>
     </head>
 </page>
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/layout/default_head_blocks.xml b/app/design/frontend/Magento/luma/Magento_Theme/layout/default_head_blocks.xml
@@ -8,5 +8,10 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
+        <font src="fonts/opensans/light/opensans-300.woff2"/>
+        <font src="fonts/opensans/regular/opensans-400.woff2"/>
+        <font src="fonts/opensans/semibold/opensans-600.woff2"/>
+        <font src="fonts/opensans/bold/opensans-700.woff2"/>
+        <font src="fonts/Luma-Icons.woff2"/>
     </head>
 </page>

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function beforeSendResponse(Http $subject): void`
`41`	`41`	`{`
`42`	`42`	`$content = $subject->getContent();`
`43`	`43`
`44`		`- if (strpos($content, '</body') !== false && $this->scopeConfig->isSetFlag(`
	`44`	`+ if (\is_string($content) && strpos($content, '</body') !== false && $this->scopeConfig->isSetFlag(`
`45`	`45`	`self::XML_PATH_USE_CSS_CRITICAL_PATH,`
`46`	`46`	`ScopeInterface::SCOPE_STORE`
`47`	`47`	`)) {`