Merge remote-tracking branch 'origin/MC-29804' into 2.4-develop-pr6

serhii-balko · serhii-balko · commit 99b620e2e646 · 2020-01-10T16:09:32.000+02:00
diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -41,7 +41,7 @@ public function beforeSendResponse(Http $subject)
     {
         $content = $subject->getContent();
         $script = [];
-        if (strpos($content, '</body') !== false) {
+        if (is_string($content) && strpos($content, '</body') !== false) {
             if ($this->scopeConfig->isSetFlag(
                 self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
                 ScopeInterface::SCOPE_STORE

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