Commit a0aa14e0 authored by Nigel McNie's avatar Nigel McNie
Browse files

Fix mistake in theme_get_path keying that resulted in losing all but the current theme's key.

parent 8835e791
...@@ -732,7 +732,7 @@ function theme_get_path($location, $pluginlocation='', $all=false) { ...@@ -732,7 +732,7 @@ function theme_get_path($location, $pluginlocation='', $all=false) {
foreach ($theme->inheritance as $themedir) { foreach ($theme->inheritance as $themedir) {
if (is_readable(get_config('docroot') . $pluginlocation . 'theme/' . $themedir . '/static/' . $location)) { if (is_readable(get_config('docroot') . $pluginlocation . 'theme/' . $themedir . '/static/' . $location)) {
if ($all) { if ($all) {
$list[$theme->theme] = get_config('docroot') . $pluginlocation . 'theme/' . $themedir . '/static/' . $location; $list[$themedir] = get_config('docroot') . $pluginlocation . 'theme/' . $themedir . '/static/' . $location;
} }
else { else {
return get_config('docroot') . $pluginlocation . 'theme/' . $themedir . '/static/' . $location; return get_config('docroot') . $pluginlocation . 'theme/' . $themedir . '/static/' . $location;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment