summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--template.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 00574af..f7e9ee4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,6 @@
Zen 6.x-2.x-dev, xxxx-xx-xx
-----------------------
+- #941714: Modules setting $classes in preprocess functions breaks expected Zen classes
- #932826: mytheme_links__system_main_menu() doesn't work as expected
- Fix PHP warning on maintenance page
- #690026: Cannot override region.tpl.php
diff --git a/template.php b/template.php
index 012a472..6bf11e2 100644
--- a/template.php
+++ b/template.php
@@ -289,7 +289,7 @@ function zen_preprocess(&$vars, $hook) {
// Views (and possibly other modules) have templates with a $classes
// variable that isn't a string, so we leave those variables alone.
if (is_string($vars[$key])) {
- $vars['classes_array'] = explode(' ', $vars[$key]);
+ $vars['classes_array'] = explode(' ', $hook . ' ' . $vars[$key]);
unset($vars[$key]);
}
}