summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2004-12-01 22:41:19 +0000
committerDries Buytaert <dries@buytaert.net>2004-12-01 22:41:19 +0000
commitcc508ad2f05a311938d8ff850660a9f65e741296 (patch)
treee734215c103d70184c863407ad5f569a8ad80d77
parent3cd9a1b2d48b0ad67d9a5a9569a6beb8939ec35a (diff)
downloadbrdo-cc508ad2f05a311938d8ff850660a9f65e741296.tar.gz
brdo-cc508ad2f05a311938d8ff850660a9f65e741296.tar.bz2
- Patch 13738 by TDobes: there was a major theming issue I missed in my bug-testing after the multi-site patch landed. Styles now seem to have their description field filled with the filename of their parent theme/template rather than the theme_key of the parent. This is a problem because init_theme still expected to see the theme_key and therefore dropped back to the base theme (no theme at all).
-rw-r--r--includes/theme.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/theme.inc b/includes/theme.inc
index 2cc2b02e4..09de82652 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -56,7 +56,7 @@ function init_theme() {
// File is a style; loads its CSS.
// Set theme to its template/theme
theme_add_style($themes[$theme]->filename);
- $theme = $themes[$theme]->description;
+ $theme = basename(dirname($themes[$theme]->description));
}
else {
// File is a template/theme