aboutsummaryrefslogtreecommitdiff
path: root/app/model
diff options
context:
space:
mode:
authorThedro Neely <thedroneely@gmail.com>2021-12-18 00:12:19 -0500
committerThedro Neely <thedroneely@gmail.com>2021-12-18 00:12:19 -0500
commit13b69343b9f8cf4be673256010e784ebd846aa95 (patch)
tree6d67f82bdf6572614d9fd6669f770d05cff25377 /app/model
parent7a61c746f0ee5d999c88414bf206a30781b87e31 (diff)
downloadthedroneely.com-13b69343b9f8cf4be673256010e784ebd846aa95.tar.gz
thedroneely.com-13b69343b9f8cf4be673256010e784ebd846aa95.tar.bz2
thedroneely.com-13b69343b9f8cf4be673256010e784ebd846aa95.zip
app/model/Navigation: Simplify active route logic
Diffstat (limited to 'app/model')
-rw-r--r--app/model/Navigation.php7
1 files changed, 1 insertions, 6 deletions
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, "/")));
}
}