Fix when content doesn't exist

thelia-modules · Dec 9, 2021 · d9dbfee · d9dbfee
1 parent c0ffd70
commit d9dbfee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Loop/BetterSeoLoop.php b/Loop/BetterSeoLoop.php
@@ -18,7 +18,7 @@ class BetterSeoLoop extends BaseI18nLoop implements PropelSearchLoopInterface
     protected function getArgDefinitions()
     {
         return new ArgumentCollection(
-            Argument::createIntTypeArgument('object_id'),
+            Argument::createAlphaNumStringTypeArgument('object_id'),
             Argument::createAlphaNumStringTypeArgument('object_type'),
             Argument::createIntTypeArgument('lang_id')
         );

diff --git a/Smarty/Plugins/BetterSeoMicroDataPlugin.php b/Smarty/Plugins/BetterSeoMicroDataPlugin.php
@@ -103,8 +103,7 @@ public function betterSeoMicroData($params)
             case 'content':
                 $id = $params['id'] ?? $this->request->get('content_id');
                 if ($id) {
-                    $content = ContentQuery::create()->filterById($id)->findOne();
-                    $microdata = $this->getContentMicroData($content, $lang);
+                    $microdata = $this->getContentMicroData($id, $lang);
                 }
                 break;
         }
@@ -283,8 +282,14 @@ protected function getFolderMicroData(Folder $folder, Lang $lang)
     /**
      * @return array
      */
-    protected function getContentMicroData(Content $content, Lang $lang)
+    protected function getContentMicroData($contentId, Lang $lang)
     {
+        $content = ContentQuery::create()->filterById($contentId)->findOne();
+
+        if (null === $content) {
+            return null;
+        }
+
         $content->setLocale($lang->getLocale());
 
         $microData = [