diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-03-16 19:41:12 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-03-16 19:41:12 +0000 |
| commit | 97ae6568e672cd4a914355e0c41b3ccce9c73b89 (patch) | |
| tree | e10d90097e70a505bd8b91ddb47a97603572282f /includes/bootstrap.inc | |
| parent | f4b531348356843a6b21fb6e3a6be32488192277 (diff) | |
| download | brdo-97ae6568e672cd4a914355e0c41b3ccce9c73b89.tar.gz brdo-97ae6568e672cd4a914355e0c41b3ccce9c73b89.tar.bz2 | |
- Patch #13738 by TDobes: theme system fixes:
* Fix a bug which would cause the "configure" link for styles to be broken.
* Fix a bug with using drupal_get_filename for theme engines. Although this is not called anywhere in core, we should still fix it for contrib. (i.e. themes that may want to manually invoke a theme engine to create a hybrid theme)
* Correct an inaccurate comment in theme.inc
* Populate the default primary links with an "edit primary links" link for consistency with the secondary links
* remove some unnecessary variables in the theme administration which had misleading and confusing names
* replace time-consuming foreach when rendering theme admin page with a more efficient array_key_exists
* usability: rather than completely removing the search box checkbox when search.module is disabled, simply disable it. (UI elements shouldn't appear/disappear.)
Diffstat (limited to 'includes/bootstrap.inc')
| -rw-r--r-- | includes/bootstrap.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 9c8781331..b60ae23c9 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -99,7 +99,7 @@ function drupal_get_filename($type, $name, $filename = NULL) { else { $config = conf_init(); $dir = (($type == 'theme_engine') ? 'themes/engines' : "${type}s"); - $file = "$name.$type"; + $file = (($type == 'theme_engine') ? "$name.engine" : "$name.$type"); foreach (array("$config/$dir/$file", "$config/$dir/$name/$file", "$dir/$file", "$dir/$name/$file") as $file) { if (file_exists($file)) { |