summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/system/system.admin.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 40cc826a2..ac19b3a05 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -211,7 +211,8 @@ function system_themes_form() {
$screenshot = NULL;
// Create a list which includes the current theme and all its base themes.
if (isset($themes[$theme->name]->base_themes)) {
- $theme_keys = array_keys($themes[$theme->name]->base_themes) + array($theme->name);
+ $theme_keys = array_keys($themes[$theme->name]->base_themes);
+ $theme_keys[] = $theme->name;
}
else {
$theme_keys = array($theme->name);