Merge pull request #884 from helsingborg-stad/fix/content-types-crash…

…ing-404 fix: resolve issue where a 404 missing a content type created a fatal…
helsingborg-stad · Mar 8, 2024 · faf77a1 · faf77a1
2 parents 3b4ca15 + bd67e2a
commit faf77a1
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/library/Helper/ContentType.php b/library/Helper/ContentType.php
@@ -96,18 +96,16 @@ protected static function processContentTypeFile(string $filename, bool $include
      */
     public static function getContentType(string $type = '')
     {
-        if (!$type) {
-            $type = self::getCurrentType();
+        if (!$type && !$type = self::getCurrentType()) {
+            return false;
         }
 
-        $contentTypeInstance = false;
         $contentTypeKey      = get_option("options_contentType_{$type}", false);
-
         if ($contentTypeKey) {
-            $contentTypeInstance = self::getContentTypeInstance($contentTypeKey);
+            return self::getContentTypeInstance($contentTypeKey);
         }
 
-        return $contentTypeInstance;
+        return false;
     }
 
     /**
@@ -212,7 +210,7 @@ public static function hasAnyContentType(string $type = ''): bool
         return false;
     }
 
-    public static function getCurrentType(): string
+    public static function getCurrentType(): ?string
     {
         return \Municipio\Helper\WP::getCurrentPostType();
     }