diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-10-12 01:23:07 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-10-12 01:23:07 +0000 |
| commit | 390e2fd2d7d2e4e7011e906b22d194568aee482c (patch) | |
| tree | 5c3476e4df30a4ca8210de0b459eaac52c132d15 | |
| parent | 72bbd21e5cb9f6eb585daf72503aa3afe01b9610 (diff) | |
| download | brdo-390e2fd2d7d2e4e7011e906b22d194568aee482c.tar.gz brdo-390e2fd2d7d2e4e7011e906b22d194568aee482c.tar.bz2 | |
#320024 by Dave Reid: Replace hardcoded drupal_required_modules() with required = TRUE in .info files.
| -rw-r--r-- | includes/module.inc | 10 | ||||
| -rw-r--r-- | modules/block/block.info | 2 | ||||
| -rw-r--r-- | modules/filter/filter.info | 2 | ||||
| -rw-r--r-- | modules/node/node.info | 2 | ||||
| -rw-r--r-- | modules/system/system.admin.inc | 2 | ||||
| -rw-r--r-- | modules/system/system.info | 2 | ||||
| -rw-r--r-- | modules/user/user.info | 2 |
7 files changed, 15 insertions, 7 deletions
diff --git a/includes/module.inc b/includes/module.inc index 835d77db5..448ff56b9 100644 --- a/includes/module.inc +++ b/includes/module.inc @@ -492,5 +492,13 @@ function module_invoke_all() { * Array of modules required by core. */ function drupal_required_modules() { - return array('block', 'filter', 'node', 'system', 'user'); + $files = drupal_system_listing('/\.info$/', 'modules', 'name', 0); + $required = array(); + foreach ($files as $name => $file) { + $info = drupal_parse_info_file($file->filename); + if (!empty($info) && !empty($info['required']) && $info['required']) { + $required[] = $name; + } + } + return $required; } diff --git a/modules/block/block.info b/modules/block/block.info index 528bf285e..c7c842554 100644 --- a/modules/block/block.info +++ b/modules/block/block.info @@ -8,4 +8,4 @@ core = 7.x files[] = block.module files[] = block.admin.inc files[] = block.install -hidden = TRUE +required = TRUE diff --git a/modules/filter/filter.info b/modules/filter/filter.info index 4a3b22b83..05d996a0b 100644 --- a/modules/filter/filter.info +++ b/modules/filter/filter.info @@ -8,4 +8,4 @@ files[] = filter.module files[] = filter.admin.inc files[] = filter.pages.inc files[] = filter.install -hidden = TRUE +required = TRUE diff --git a/modules/node/node.info b/modules/node/node.info index 443e5d2c0..975b5dcc5 100644 --- a/modules/node/node.info +++ b/modules/node/node.info @@ -9,4 +9,4 @@ files[] = content_types.inc files[] = node.admin.inc files[] = node.pages.inc files[] = node.install -hidden = TRUE +required = TRUE diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 307653bda..2cf868bec 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -616,7 +616,7 @@ function system_modules($form_state = array()) { // Remove hidden modules from display list. foreach ($files as $filename => $file) { - if (!empty($file->info['hidden'])) { + if (!empty($file->info['hidden']) || !empty($file->info['required'])) { unset($files[$filename]); } } diff --git a/modules/system/system.info b/modules/system/system.info index 35fe34182..8bf71536f 100644 --- a/modules/system/system.info +++ b/modules/system/system.info @@ -8,4 +8,4 @@ files[] = system.module files[] = system.admin.inc files[] = image.gd.inc files[] = system.install -hidden = TRUE +required = TRUE diff --git a/modules/user/user.info b/modules/user/user.info index 837ff733e..98ef2dfb0 100644 --- a/modules/user/user.info +++ b/modules/user/user.info @@ -8,4 +8,4 @@ files[] = user.module files[] = user.admin.inc files[] = user.pages.inc files[] = user.install -hidden = TRUE +required = TRUE |