fixed bug when dimension prefix is empty

breadlesscode · Jan 9, 2018 · 9720efb · 9720efb
1 parent 94a9dd2
commit 9720efb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Classes/ViewHelpers/PageViewHelper.php b/Classes/ViewHelpers/PageViewHelper.php
@@ -79,7 +79,7 @@ protected function findErrorPage($requestPath, $statusCode)
             ->filter(function ($page) use ($dimension) {
                 return \in_array($dimension, $page->getDimensions()['language']);
             })
-            // filter all pages which not in the correct path
+            // sort by distance
             ->sortBy(function ($page) use ($requestPath, $dimension) {
                 return PathUtility::compare(
                     $this->getPathWithoutDimensionPrefix($requestPath),
@@ -101,7 +101,7 @@ protected function getPathWithoutDimensionPrefix($path)
         $matches = [];
         preg_match(FrontendNodeRoutePartHandler::DIMENSION_REQUEST_PATH_MATCHER, ltrim($path, '/'), $matches);
 
-        if ($presets->pluck('uriSegment')->contains($matches['firstUriPart'])) {
+        if (isset($matches['firstUriPart']) && $presets->pluck('uriSegment')->contains($matches['firstUriPart'])) {
             return substr(ltrim($path, '/'), strlen($matches['firstUriPart']));
         }