diff options
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/system.admin.inc | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 03db7b683..fe94ba191 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -657,7 +657,7 @@ function system_modules($form_state = array()) { } } // Generate link for module's help page, if there is one. - if ($help_arg && module_hook($filename, 'help')) { + if ($help_arg && $module->status && in_array($filename, module_implements('help'))) { if (module_invoke($filename, 'help', "admin/help#$filename", $help_arg)) { // Module has a help page. $extra['help'] = theme('more_help_link', url("admin/help/$filename")); diff --git a/modules/system/system.module b/modules/system/system.module index 48ac89a63..b4f796986 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1398,12 +1398,12 @@ function system_get_module_admin_tasks($module) { $admin_tasks = array(); $admin_task_count = 0; // Check for permissions. - if (module_hook($module, 'perm') && $admin_access) { + if (in_array($module, module_implements('perm')) && $admin_access) { $admin_tasks[-1] = l(t('Configure permissions'), 'admin/user/permissions', array('fragment' => 'module-' . $module)); } // Check for menu items that are admin links. - if ($menu = module_invoke($module, 'menu')) { + if (in_array($module, module_implements('menu')) && $menu = module_invoke($module, 'menu')) { foreach (array_keys($menu) as $path) { if (isset($items[$path])) { $admin_tasks[$items[$path]['title'] . $admin_task_count ++] = l($items[$path]['title'], $path); |