From b582169b41db6612f350ae6ef1dbcb907f44981f Mon Sep 17 00:00:00 2001
From: Bogdanova Olga <o_bogdanova@inbox.ru>
Date: Mon, 29 Mar 2021 14:51:07 +0300
Subject: [PATCH 1/2] Issues-505: Use global primary color for email action
 button

---
 vanilla/applications/dashboard/views/email/email-basic.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vanilla/applications/dashboard/views/email/email-basic.tpl b/vanilla/applications/dashboard/views/email/email-basic.tpl
index dbfcbc1..f410783 100644
--- a/vanilla/applications/dashboard/views/email/email-basic.tpl
+++ b/vanilla/applications/dashboard/views/email/email-basic.tpl
@@ -157,7 +157,7 @@
                                 margin-bottom: 15px'>{$email.message}</p>
                         {if $email.button}
                             <div style="margin: 0;padding: 0; text-align: center">
-                                <a class="button" href="{$email.button.url}" style="margin: 0;padding: 0;color: {$email.button.textColor};
+                                <a class="button" href="{$email.button.url}" style="margin: 0;padding: 0;color: #137d60;
                                         cursor: pointer;display: inline-block;" rel=" noopener noreferrer" target="_blank">{$email.button.text}</a>
                             </div>
                         {/if}

From e28a3c9d0158d1028fefa54ae1ec4a05dcabef2a Mon Sep 17 00:00:00 2001
From: Bogdanova Olga <o_bogdanova@inbox.ru>
Date: Mon, 29 Mar 2021 22:45:39 +0300
Subject: [PATCH 2/2] Issues-507: Use default order of forums from settings

---
 .../vanilla/controllers/class.categoriescontroller.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vanilla/applications/vanilla/controllers/class.categoriescontroller.php b/vanilla/applications/vanilla/controllers/class.categoriescontroller.php
index d1c9a02..d3aeb2e 100644
--- a/vanilla/applications/vanilla/controllers/class.categoriescontroller.php
+++ b/vanilla/applications/vanilla/controllers/class.categoriescontroller.php
@@ -614,7 +614,7 @@ public function all($Category = '', $displayAs = '') {
         }
         // FIX: https://github.com/topcoder-platform/forums/issues/422
         // Sorting for Flat type in SQL
-        if($displayAs != 'Flat') {
+        if($displayAs != 'Flat' && $Category) {
             if ($this->data('CategorySort')) {
                 if ($this->data('CategorySort') == self::SORT_OLDEST_POST) {
                     usort($categoryTree, function ($a, $b) {