[BUGFIX] Check if category does exist before accessing properties

TYPO3GmbH · May 13, 2019 · 6675721 · 6675721
1 parent b716822
commit 6675721
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/Classes/Controller/PostController.php b/Classes/Controller/PostController.php
@@ -202,11 +202,10 @@ public function listPostsByDateAction(int $year = null, int $month = null): void
      */
     public function listPostsByCategoryAction(Category $category = null): void
     {
-        if (null === $category) {
+        if ($category === null) {
             $categories = $this->categoryRepository->getByReference(
                 'tt_content',
                 $this->configurationManager->getContentObject()->data['uid']
-
             );
 
             if (!empty($categories)) {
@@ -215,15 +214,15 @@ public function listPostsByCategoryAction(Category $category = null): void
             }
         }
 
-        if (null === $category) {
-            $this->view->assign('categories', $this->categoryRepository->findAll());
-        } else {
+        if ($category) {
             $posts = $this->postRepository->findAllByCategory($category);
             $this->view->assign('posts', $posts);
             $this->view->assign('category', $category);
             MetaService::set(MetaService::META_TITLE, $category->getTitle());
             MetaService::set(MetaService::META_DESCRIPTION, $category->getDescription());
             MetaService::set(MetaService::META_CATEGORIES, [$category->getTitle()]);
+        } else {
+            $this->view->assign('categories', $this->categoryRepository->findAll());
         }
     }
 

diff --git a/Resources/Private/Templates/Post/ListPostsByCategory.html b/Resources/Private/Templates/Post/ListPostsByCategory.html
@@ -2,18 +2,8 @@
 <f:layout name="Default" />
 
 <f:section name="content">
-    <f:if condition="{categories}">
+    <f:if condition="{category}">
         <f:then>
-            <f:comment>In case categories is set, to special category is in request and we show all categories as links.</f:comment>
-            <h1 class="page-title"><f:translate key="headline.categories" /></h1>
-            <ul class="list-inline">
-                <f:for each="{categories}" as="category">
-                    <li><blog:link.category category="{category}" /></li>
-                </f:for>
-            </ul>
-        </f:then>
-        <f:else>
-            <f:comment>In case categories is NOT set, a special category is in request and we show all blogs posts of this category.</f:comment>
             <h1 class="page-title"><f:translate key="headline.category" arguments="{0: category.title}" /> <blog:link.category rss="true" category="{category}"><i class="fa fa-rss-square"></i></blog:link.category></h1>
             <div class="taxonomy-description">
                 <p>{category.description}</p>
@@ -22,6 +12,14 @@ <h1 class="page-title"><f:translate key="headline.category" arguments="{0: categ
                 </f:if>
             </div>
             <f:render partial="List" arguments="{_all}" />
+        </f:then>
+        <f:else>
+            <h1 class="page-title"><f:translate key="headline.categories" /></h1>
+            <ul class="list-inline">
+                <f:for each="{categories}" as="category">
+                    <li><blog:link.category category="{category}" /></li>
+                </f:for>
+            </ul>
         </f:else>
     </f:if>
 </f:section>