Merge pull request #509 from topcoder-platform/issues-505

Issues-505: Use global primary color for email action button, Issues-507: Use default order of forums from settings

Author: jmgasper

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}

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) {