summaryrefslogtreecommitdiff
path: root/modules/system/system.admin.inc
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-25 15:28:05 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-25 15:28:05 +0000
commitb30633deee82d39e30810a3ede04bb63f7a33688 (patch)
tree7cfe65597fcecbca3cfa4eff8787baa5521aaae9 /modules/system/system.admin.inc
parent15a7ec5a4e58133bb3bdcf62892001b1cad53b3b (diff)
downloadbrdo-b30633deee82d39e30810a3ede04bb63f7a33688.tar.gz
brdo-b30633deee82d39e30810a3ede04bb63f7a33688.tar.bz2
#489762 follow-up by JohnAlbin: Fix for sub-theme screenshots not showing up.
Diffstat (limited to 'modules/system/system.admin.inc')
-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);