From 13b69343b9f8cf4be673256010e784ebd846aa95 Mon Sep 17 00:00:00 2001
From: Thedro Neely <thedroneely@gmail.com>
Date: Sat, 18 Dec 2021 00:12:19 -0500
Subject: app/model/Navigation: Simplify active route logic

---
 app/model/Navigation.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'app/model')

diff --git a/app/model/Navigation.php b/app/model/Navigation.php
index d32546b..055c3ce 100644
--- a/app/model/Navigation.php
+++ b/app/model/Navigation.php
@@ -7,13 +7,8 @@ class Navigation
         return (bool) (strpos($_SERVER['REQUEST_URI'], $route) !== false);
     }
 
-    public function isActiveHome()
-    {
-        return (bool) (strlen(strtok($_SERVER['REQUEST_URI'], '?')) === 1);
-    }
-
     public function isActive($route)
     {
-        return (bool) ($_SERVER['REQUEST_URI'] === $route || $this->requestContains($route));
+        return (bool) (ltrim(Request::uri(), "/") === ltrim($route, "/") || $this->requestContains(ltrim($route, "/")));
     }
 }
-- 
cgit v1.2.3