Commit 43a14292 authored by Francois Marier's avatar Francois Marier
Browse files

Pieforms: remove over-zealous escaping

This problem was partly introduced in d7e90db7

Signed-off-by: default avatarFrancois Marier <francois@catalyst.net.nz>
parent aad86b66
...@@ -57,11 +57,11 @@ function pieform_renderer_div(Pieform $form, $element) {/*{{{*/ ...@@ -57,11 +57,11 @@ function pieform_renderer_div(Pieform $form, $element) {/*{{{*/
// Description - optional description of the element, or other note that should be visible // Description - optional description of the element, or other note that should be visible
// on the form itself (without the user having to hover over contextual help // on the form itself (without the user having to hover over contextual help
if ((!$form->has_errors() || $form->get_property('showdescriptiononerror')) && !empty($element['description'])) { if ((!$form->has_errors() || $form->get_property('showdescriptiononerror')) && !empty($element['description'])) {
$result .= '<div class="description"> ' . Pieform::hsc($element['description']) . "</div>"; $result .= '<div class="description"> ' . $element['description'] . "</div>";
} }
if (!empty($element['error'])) { if (!empty($element['error'])) {
$result .= '<div class="errmsg">' . Pieform::hsc($element['error']) . '</div>'; $result .= '<div class="errmsg">' . $element['error'] . '</div>';
} }
$result .= "</div>\n"; $result .= "</div>\n";
......
...@@ -86,13 +86,13 @@ function pieform_renderer_table(Pieform $form, $element) {/*{{{*/ ...@@ -86,13 +86,13 @@ function pieform_renderer_table(Pieform $form, $element) {/*{{{*/
else { else {
$result .= "\t<tr>\n\t\t<td colspan=\"2\" class=\"description\">"; $result .= "\t<tr>\n\t\t<td colspan=\"2\" class=\"description\">";
} }
$result .= Pieform::hsc($element['description']); $result .= $element['description'];
$result .= "</td>\n\t</tr>\n"; $result .= "</td>\n\t</tr>\n";
} }
if (!empty($element['error'])) { if (!empty($element['error'])) {
$result .= "\t<tr>\n\t\t<td colspan=\"2\" class=\"errmsg\">"; $result .= "\t<tr>\n\t\t<td colspan=\"2\" class=\"errmsg\">";
$result .= Pieform::hsc($element['error']); $result .= $element['error'];
$result .= "</td>\n\t</tr>\n"; $result .= "</td>\n\t</tr>\n";
} }
......
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