summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-09-30 12:35:27 +0000
committerDries Buytaert <dries@buytaert.net>2009-09-30 12:35:27 +0000
commit15343a993ce45ec6626c79406aaa85c2631d023e (patch)
treec2d0ecd07ac8cb03d6451f7f28422439d075ee7b
parent57090c33da0e007e6569106c92ce5b3cd3745bf7 (diff)
downloadbrdo-15343a993ce45ec6626c79406aaa85c2631d023e.tar.gz
brdo-15343a993ce45ec6626c79406aaa85c2631d023e.tar.bz2
- Patch #591758 by catch: system_region_list() should use list_themes() instead of a direct db_query().
-rw-r--r--modules/system/system.module3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/system/system.module b/modules/system/system.module
index a4cc60ed1..56695e220 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -2136,7 +2136,8 @@ function system_region_list($theme_key, $show = REGIONS_ALL) {
$list = &drupal_static(__FUNCTION__, array());
if (empty($list[$theme_key][$show])) {
- $info = unserialize(db_query("SELECT info FROM {system} WHERE type = :type AND name = :name", array(':type' => 'theme', ':name' => $theme_key))->fetchField());
+ $themes = list_themes();
+ $info = $themes[$theme_key]->info;
// If requested, suppress hidden regions. @see block_admin_display_form().
foreach ($info['regions'] as $name => $label) {
if ($show == REGIONS_ALL || !isset($info['regions_hidden']) || !in_array($name, $info['regions_hidden'])) {