Commit d9110446 authored by KarenS's avatar KarenS

#696620 Make sure non-empty descriptions don't run through translator.

parent 514e2162
......@@ -18,7 +18,6 @@ Bugfixes:
- #986612 by Dave Reid: Token integration - fix variable name clash (harmless in normal cases)
- #435520 by yched, sun: Fix text fields rendered as 'n/a' in some cases
- #739490 by foripepe: Token integration - fix notices during token generation
>>>>>>> 1.1.6.410
CCK 6.x-2.8
===========
......
......@@ -586,7 +586,7 @@ function fieldgroup_build_content($group, &$node, $teaser, $page) {
$label = $group['settings']['display']['label'] == 'above';
$element = array(
'#title' => $label ? check_plain(t($group['label'])) : '',
'#description' => $label ? content_filter_xss(t($group['settings']['display']['description'])) : '',
'#description' => $label & !empty($group['settings']['display']['description']) ? content_filter_xss(t($group['settings']['display']['description'])) : '',
);
$format = isset($group['settings']['display'][$context]['format']) ? $group['settings']['display'][$context]['format'] : 'fieldset';
......
Markdown is supported
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