From a5d3dfc916032454074b27ea3a37323b08ac44e6 Mon Sep 17 00:00:00 2001 From: "Bradley M. Froehle" Date: Wed, 31 Aug 2011 16:49:29 -0700 Subject: [PATCH] 16 --- includes/module.inc | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/includes/module.inc b/includes/module.inc index bd05f6a..6bedf14 100644 --- a/includes/module.inc +++ b/includes/module.inc @@ -111,7 +111,7 @@ function module_list($refresh = FALSE, $bootstrap_refresh = FALSE, $sort = FALSE * @return * An associative array of modules or themes, keyed by name. For $type * 'bootstrap' and 'module_enabled', the array values equal the keys. - * For For $type 'theme', the array values are objects representing the + * For $type 'theme', the array values are objects representing the * respective database row, with the 'info' property already unserialized. * * @see module_list() @@ -162,15 +162,13 @@ function system_list($type) { // consistent with the one used in module_implements(). $result = db_query("SELECT * FROM {system} WHERE type = 'theme' OR (type = 'module' AND status = 1) ORDER BY weight ASC, name ASC"); foreach ($result as $record) { - if ($record->type == 'theme') { - $record->info = unserialize($record->info); - } // Build a list of all enabled modules. if ($record->type == 'module') { $lists['module_enabled'][$record->name] = $record->name; } // Build a list of themes. if ($record->type == 'theme') { + $record->info = unserialize($record->info); $lists['theme'][$record->name] = $record; } // Build a list of filenames so drupal_get_filename can use it. -- 1.7.6