* page ID extraction refactored

1 files changed, 7 insertions, 3 deletions

diff --git a/include/Menu.class.php b/include/Menu.class.php
index 3a61595..acb2629 100644
--- a/include/Menu.class.php
+++ b/include/Menu.class.php
@@ -6,25 +6,29 @@ class Menu {
         return Env::get('menu', 'items');
     }
 
+    private static function _getPageID($url) {
+        return trim(explode('#', $url)[0], '/');
+    }
+
     public static function getActiveLink($pageID) {
         $activeContent = $pageID;
         foreach (self::getItems() as $item => $link) {
             if (is_array($link)) {
                 foreach ($link as $subitem => $sublink) {
-                    if (trim($sublink, '/') === $pageID) {
+                    if (self::_getPageID($sublink) === $pageID) {
                         $activeContent = $link['_'];
                         break;
                     }
                 }
             } else {
-                if (trim($link, '/') === $pageID) {
+                if (self::_getPageID($link) === $pageID) {
                     $activeContent = $link;
                 }
             }
         }
         return $activeContent;
     }
-    
+
 }
 
 ?>