Tolerate no page context

richardhj · web-flow · commit 285cdc8c39a6 · 2022-02-09T21:46:06.000+01:00
diff --git a/src/Encore/EncoreEntrypointLookupCollection.php b/src/Encore/EncoreEntrypointLookupCollection.php
@@ -44,9 +44,9 @@ public function getEntrypointLookup(string $buildName = null): EntrypointLookupI
     {
         if (null === $buildName || '_default' === $buildName) {
             /** @var PageModel $pageModel */
-            $pageModel = $GLOBALS['objPage'];
-
-            $buildName = $pageModel->theme;
+            if (null !== $pageModel = $GLOBALS['objPage'] ?? null) {
+                $buildName = $pageModel->theme;
+            }
         }
 
         $themePath = Path::join($this->webDir, 'themes', $buildName, 'entrypoints.json');

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ public function getEntrypointLookup(string $buildName = null): EntrypointLookupI`
`44`	`44`	`{`
`45`	`45`	`if (null === $buildName \|\| '_default' === $buildName) {`
`46`	`46`	`/** @var PageModel $pageModel */`
`47`		`- $pageModel = $GLOBALS['objPage'];`
`48`		`-`
`49`		`- $buildName = $pageModel->theme;`
	`47`	`+ if (null !== $pageModel = $GLOBALS['objPage'] ?? null) {`
	`48`	`+ $buildName = $pageModel->theme;`
	`49`	`+ }`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`$themePath = Path::join($this->webDir, 'themes', $buildName, 'entrypoints.json');`