Merge branch '7.1'

ezpublishlegacy · Jun 19, 2018 · c423d67 · c423d67
2 parents 9b2ba45 + c379807
commit c423d67
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/eZ/Publish/Core/MVC/Symfony/Matcher/ContentBased/Id/Location.php b/eZ/Publish/Core/MVC/Symfony/Matcher/ContentBased/Id/Location.php
@@ -46,6 +46,10 @@ public function match(View $view)
             return false;
         }
 
+        if (null === $view->getLocation()) {
+            return false;
+        }
+
         return isset($this->values[$view->getLocation()->id]);
     }
 }