Merge pull request #8568 from magento-cia/AC-8477-fix

dvoskoboinikov · web-flow · commit 01af1332d926 · 2023-09-27T16:32:48.000-05:00
AC-8477: /page_cache/block/esi handles param enhancement
diff --git a/app/code/Magento/PageCache/Controller/Block.php b/app/code/Magento/PageCache/Controller/Block.php
@@ -92,7 +92,8 @@ public function __construct(
             ?: ObjectManager::getInstance()->get(LayoutCacheKeyInterface::class);
         $this->regexValidatorFactory = $regexValidatorFactory
             ?: ObjectManager::getInstance()->get(RegexFactory::class);
-        $this->config = $scopeConfig;
+        $this->config = $scopeConfig
+            ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@ public function __construct(`
`92`	`92`	`?: ObjectManager::getInstance()->get(LayoutCacheKeyInterface::class);`
`93`	`93`	`$this->regexValidatorFactory = $regexValidatorFactory`
`94`	`94`	`?: ObjectManager::getInstance()->get(RegexFactory::class);`
`95`		`- $this->config = $scopeConfig;`
	`95`	`+ $this->config = $scopeConfig`
	`96`	`+ ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`/**`