Correctly handle invalid page ID

terminal42 · Jun 7, 2021 · da7470a · da7470a
1 parent 31a92e0
commit da7470a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/library/Terminal42/ChangeLanguage/EventListener/InsertTagsListener.php b/library/Terminal42/ChangeLanguage/EventListener/InsertTagsListener.php
@@ -12,6 +12,7 @@
 namespace Terminal42\ChangeLanguage\EventListener;
 
 use Contao\Controller;
+use Contao\PageModel;
 use Terminal42\ChangeLanguage\PageFinder;
 
 class InsertTagsListener
@@ -33,7 +34,12 @@ public function onReplaceInsertTags($insertTag)
 
         try {
             $pageFinder = new PageFinder();
-            $currentPage = \PageModel::findByIdOrAlias($parts[1]);
+            $currentPage = PageModel::findByIdOrAlias($parts[1]);
+
+            if (null === $currentPage) {
+                return '';
+            }
+
             $targetPage = $pageFinder->findAssociatedForLanguage($currentPage, $parts[2]);
         } catch (\RuntimeException $e) {
             // parent page of current page not found or not published