summaryrefslogtreecommitdiff
path: root/modules/system/system.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-09-16 18:08:59 +0000
committerDries Buytaert <dries@buytaert.net>2008-09-16 18:08:59 +0000
commit6b7d5fe21bce972bb0e0fbd5b0c75d1e215b9e8d (patch)
tree40f6384ad4e33f78b08f58a72086b5177db32293 /modules/system/system.module
parentae31a4ab76fb8f89500fd509df8c951b4770e006 (diff)
downloadbrdo-6b7d5fe21bce972bb0e0fbd5b0c75d1e215b9e8d.tar.gz
brdo-6b7d5fe21bce972bb0e0fbd5b0c75d1e215b9e8d.tar.bz2
- Patch #245544 by Dave Reid, oadaeh, drupalgeek: the admin_tasks variable is initialized twice.
Diffstat (limited to 'modules/system/system.module')
-rw-r--r--modules/system/system.module5
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/system/system.module b/modules/system/system.module
index a3b3a32b9..6bc1bfc46 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1357,9 +1357,6 @@ function system_admin_compact_page($mode = 'off') {
function system_get_module_admin_tasks($module) {
static $items;
- $admin_access = user_access('administer permissions');
- $admin_tasks = array();
-
if (!isset($items)) {
$result = db_query("
SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.type, ml.*
@@ -1372,6 +1369,8 @@ function system_get_module_admin_tasks($module) {
}
}
}
+
+ $admin_access = user_access('administer permissions');
$admin_tasks = array();
$admin_task_count = 0;
// Check for permissions.