ISTWCMS-4653: checking for unpublished nodes when getting the menu

src/Service/UWService.php

@@ -293,6 +293,11 @@ class UWService implements UWServiceInterface {
    */
   public function uwGetMenu(string $menu_name = 'main', bool $count_menu_items = FALSE, bool $include_parent_in_count = FALSE): array {
 
+    // The base path, need this for removing when on subfoldered sites,
+    // for example d8/fdsu5/, we need to remove the fdsu5 from the path
+    // alias.
+    global $base_path;
+
     // Get the main menu from the simplify menu module.
     $menu = $this->simplifyMenu->getMenuTree($menu_name);
 
@@ -302,8 +307,12 @@ class UWService implements UWServiceInterface {
     // Step through each menu and ensure that it is published.
     foreach ($menu as $key => $m) {
 
+      // Remove the base path from the url so that we can get
+      // the actual content from the path alias.
+      $alias = str_replace($base_path, '', $m['url']);
+
       // Get the path from the URL of the menu link.
-      $path = $this->pathAliasManager->getPathByAlias($m['url']);
+      $path = $this->pathAliasManager->getPathByAlias('/' . $alias);
 
       // Check if it is a node path and if so check if published.
       if(preg_match('/node\/(\d+)/', $path, $matches)) {