summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortregeagle2013-08-30 13:41:39 (GMT)
committer Wim Leers2013-08-30 13:41:39 (GMT)
commit98add9d986f180158faacf74ccb9170356e1f04a (patch)
tree33495f4dcf823094279662d40b947ee00f0d6c30
parentc80a96d99e7ca2ce0493dbe6c49130eff63229ee (diff)
Issue #1587570 by tregeagle, Ignigena, RobKoberg, yannickoo, RoSk0: Fixed PHP 5.4 compatibility of theme_hierarchical_select().
-rw-r--r--includes/theme.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/includes/theme.inc b/includes/theme.inc
index e633f0a..9f83393 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -83,8 +83,7 @@ function theme_hierarchical_select($variables) {
'hierarchical-select-wrapper-for-name-' . $element['#id'],
(isset($element['#config']['config_id'])) ? 'hierarchical-select-wrapper-for-config-' . $element['#config']['config_id'] : NULL,
);
- array_merge($element['#attributes']['class'], $classes);
- $element['#attributes']['class'] .= ' ' . implode(' ', $classes);
+ $element['#attributes']['class'] = array_merge($element['#attributes']['class'], $classes);
$element['#attributes']['id'] = "hierarchical-select-$hsid-wrapper";
$element['#id'] = "hierarchical-select-$hsid-wrapper"; // This ensures the label's for attribute is correct.