Commit 0772cc7c authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4523 (Disabled modules show in Permissions Tree Editor)

parent d258ca95
Loading
Loading
Loading
Loading
+11 −7
Original line number Diff line number Diff line
@@ -227,9 +227,7 @@ class Hook_sitemap_page extends Hook_sitemap_base
        $require_permission_support = (($options & SITEMAP_GEN_REQUIRE_PERMISSION_SUPPORT) != 0);
        $check_perms = (($options & SITEMAP_GEN_CHECK_PERMS) != 0);

        if (($max_recurse_depth === null) || ($recurse_level < $max_recurse_depth) || (!isset($row[1]))) {
            // Look for entry points to put under this
            if (($details[0] == 'MODULES' || $details[0] == 'MODULES_CUSTOM') && (!$require_permission_support) && (!has_low_memory())) {
        if ($details[0] == 'MODULES' || $details[0] == 'MODULES_CUSTOM') {
            $simplified = (strpos($extra, ':catalogue_name=') !== false);

            $use_page_groupings = (($options & SITEMAP_GEN_USE_PAGE_GROUPINGS) != 0) && (($options & SITEMAP_GEN_USE_PAGE_GROUPINGS_SUPPRESS) != 0);
@@ -241,14 +239,21 @@ class Hook_sitemap_page extends Hook_sitemap_base
                $simplified || $use_page_groupings // $be_deferential
            ));

                $has_entry_points = false;
            if ($functions[0] === null) {
                return null;
            }

                if (!is_null($functions[0])) {
            $entry_points = is_array($functions[0]) ? call_user_func_array($functions[0][0], $functions[0][1]) : eval($functions[0]);

                    if (is_null($entry_points)) {
            if ($entry_points === null) {
                return null;
            }
        }

        if (($max_recurse_depth === null) || ($recurse_level < $max_recurse_depth) || (!isset($row[1]))) {
            // Look for entry points to put under this
            if (($details[0] == 'MODULES' || $details[0] == 'MODULES_CUSTOM') && (!$require_permission_support) && (!has_low_memory())) {
                $has_entry_points = false;

                if (count($entry_points) > 0) {
                    $struct['has_possible_children'] = true;
@@ -366,7 +371,6 @@ class Hook_sitemap_page extends Hook_sitemap_base
                    }
                }
            }
            }

            // Look for virtual nodes to put under this
            if (!has_low_memory()) {