From 8264f1d0e7d9fca13224f5d7dcd61ddc5331d1a9 Mon Sep 17 00:00:00 2001
From: Bogdanova Olga <o_bogdanova@inbox.ru>
Date: Mon, 8 Feb 2021 15:33:02 +0300
Subject: [PATCH] Isues-360: announcements and discussions are sorted by date
 in recent discussions

---
 .../controllers/class.discussionscontroller.php       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/vanilla/applications/vanilla/controllers/class.discussionscontroller.php b/vanilla/applications/vanilla/controllers/class.discussionscontroller.php
index 8b4b4c1..e38f38e 100644
--- a/vanilla/applications/vanilla/controllers/class.discussionscontroller.php
+++ b/vanilla/applications/vanilla/controllers/class.discussionscontroller.php
@@ -159,7 +159,8 @@ public function index($Page = false) {
         $categoryIDs = $this->getCategoryIDs();
         // Fix to segregate announcement conditions until announcement caching has been reworked.
         // See https://github.com/vanilla/vanilla/issues/7241
-        $where = $announcementsWhere = [];
+        $where = ['Announce' => 'all'];
+        // Get Discussions  and Announcements
         if ($this->data('Followed')) {
             $followedCategories = array_keys($categoryModel->getFollowed(Gdn::session()->UserID));
             $visibleCategoriesResult = CategoryModel::instance()->getVisibleCategoryIDs(['filterHideDiscussions' => true]);
@@ -170,7 +171,7 @@ public function index($Page = false) {
             }
             $where['d.CategoryID'] = $visibleFollowedCategories;
         } elseif ($categoryIDs) {
-            $where['d.CategoryID'] = $announcementsWhere['d.CategoryID'] = CategoryModel::filterCategoryPermissions($categoryIDs);
+            $where['d.CategoryID'] = CategoryModel::filterCategoryPermissions($categoryIDs);
         } else {
             $visibleCategoriesResult = CategoryModel::instance()->getVisibleCategoryIDs(['filterHideDiscussions' => true]);
             if ($visibleCategoriesResult !== true) {
@@ -189,11 +190,7 @@ public function index($Page = false) {
 
         $this->setData('CountDiscussions', $CountDiscussions);
 
-        // Get Announcements
-        $this->AnnounceData = $Offset == 0 ? $DiscussionModel->getAnnouncements($announcementsWhere) : false;
-        $this->setData('Announcements', $this->AnnounceData !== false ? $this->AnnounceData : [], true);
-
-        // Get Discussions
+        // Get Discussions  and Announcements
         $this->DiscussionData = $DiscussionModel->getWhereRecent($where, $Limit, $Offset);
 
         $this->setData('Discussions', $this->DiscussionData, true);