From 6b59c40bac077986bf7bbbc490b22604f2de72ed Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Thu, 11 Jan 2018 12:38:15 +0100
Subject: [PATCH] Update headermenu.tpl and Category model

---
 Changelog                             | 1 +
 app/Models/Category.php               | 4 ++--
 public/themes/Charisma/headermenu.tpl | 2 +-
 public/themes/Gamma/headermenu.tpl    | 2 +-
 public/themes/Gentele/headermenu.tpl  | 2 +-
 public/themes/Omicron/headermenu.tpl  | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Changelog b/Changelog
index f5efa0da2..406a2c5c4 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-01-11 DariusIII
+	* CHg: Update headermenu.tpl and Category model
 	* Chg: Update Releases and Genres classes
 	* Chg: Update Categorize and Regexes classes
 	* Chg: Remove nntmux/Category class and move its functions into Category model
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 7675637d5..bbba4f2b0 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -439,13 +439,13 @@ class Category extends Model
         if ($arrsql !== null) {
             $arr = $arrsql;
         } else {
-            $arr = $sql->get();
+            $arr = $sql->get()->toArray();
             $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG);
             Cache::put(md5(implode(',', $excludedCats).implode(',', $roleExcludedCats)), $arr, $expiresAt);
         }
 
         foreach ($arr as $key => $val) {
-            if ($val['id'] === '0') {
+            if ($val['id'] === self::OTHER_ROOT) {
                 $item = $arr[$key];
                 unset($arr[$key]);
                 $arr[] = $item;
diff --git a/public/themes/Charisma/headermenu.tpl b/public/themes/Charisma/headermenu.tpl
index 7b8aaf799..e415d02de 100755
--- a/public/themes/Charisma/headermenu.tpl
+++ b/public/themes/Charisma/headermenu.tpl
@@ -180,7 +180,7 @@
 						</ul>
 					</li>
 				{/if}
-				{if $parentcat.id === "0"}
+				{if $parentcat.id == {$catClass::OTHER_ROOT}}
 					<li class="nav-parent">
 						<a href="#" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" data-delay="30">
 							<i class="zmdi zmdi-thumb-up-down"></i> Other</a>
diff --git a/public/themes/Gamma/headermenu.tpl b/public/themes/Gamma/headermenu.tpl
index 4a686df37..8ff687845 100755
--- a/public/themes/Gamma/headermenu.tpl
+++ b/public/themes/Gamma/headermenu.tpl
@@ -154,7 +154,7 @@
 			</ul>
 		</li>
 	{/if}
-		{if $parentcat.id === "0"}
+		{if $parentcat.id == {$catClass::OTHER_ROOT}}
 			<li class="dropdown">
 				<a id="dropOther" class="dropdown-hover" data-hover="dropdown" href="#">Other <b class="caret"></b></a>
 				<ul class="dropdown-menu" role="menu" aria-labelledby="dropOther">
diff --git a/public/themes/Gentele/headermenu.tpl b/public/themes/Gentele/headermenu.tpl
index 55ed67aa8..923f64ffa 100755
--- a/public/themes/Gentele/headermenu.tpl
+++ b/public/themes/Gentele/headermenu.tpl
@@ -201,7 +201,7 @@
 							</ul>
 						</li>
 					{/if}
-					{if $parentcat.id === "0"}
+					{if $parentcat.id == {$catClass::OTHER_ROOT}}
 						<li class="nav-parent">
 							<a href="#" data-toggle="dropdown" data-hover="dropdown" data-close-others="true"
 							   data-delay="30">
diff --git a/public/themes/Omicron/headermenu.tpl b/public/themes/Omicron/headermenu.tpl
index 5254dd8c8..ee5cf4841 100755
--- a/public/themes/Omicron/headermenu.tpl
+++ b/public/themes/Omicron/headermenu.tpl
@@ -180,7 +180,7 @@
 						</ul>
 					</li>
 				{/if}
-				{if $parentcat.id === "0"}
+				{if $parentcat.id == {$catClass::OTHER_ROOT}}
 					<li class="nav-parent">
 						<a href="#" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" data-delay="30">
 							<i class="fa fa-bolt"></i> Other<i class="fa fa-angle-down"></i></a>