summaryrefslogtreecommitdiff
path: root/system/helpers
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-12-25 21:05:39 -0800
committerBharat Mediratta <bharat@menalto.com>2009-12-25 21:05:39 -0800
commit32d25dafd5b033338b6a9bb8c7c53edab462543a (patch)
tree666ba134ae5ddb938b7f22bc064f8cac0eaabdf6 /system/helpers
parentda7ee6ab30d8f2545781910d7ef1f573c5dfee93 (diff)
Prevent form::dropdown from overzealously escaping ampersands by applying this diff:
http://dev.kohanaframework.org/attachments/1490/form.diff Upstream ticket: http://dev.kohanaframework.org/issues/2463
Diffstat (limited to 'system/helpers')
-rw-r--r--system/helpers/form.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/helpers/form.php b/system/helpers/form.php
index 4225b1b6..b7c60c24 100644
--- a/system/helpers/form.php
+++ b/system/helpers/form.php
@@ -246,14 +246,14 @@ class form_Core {
$inner_key = (string) $inner_key;
$sel = in_array($inner_key, $selected) ? ' selected="selected"' : '';
- $input .= '<option value="'.$inner_key.'"'.$sel.'>'.htmlspecialchars($inner_val, ENT_QUOTES, Kohana::CHARSET).'</option>'."\n";
+ $input .= '<option value="'.$inner_key.'"'.$sel.'>'.htmlspecialchars($inner_val, ENT_QUOTES, Kohana::CHARSET, FALSE).'</option>'."\n";
}
$input .= '</optgroup>'."\n";
}
else
{
$sel = in_array($key, $selected) ? ' selected="selected"' : '';
- $input .= '<option value="'.$key.'"'.$sel.'>'.htmlspecialchars($val, ENT_QUOTES, Kohana::CHARSET).'</option>'."\n";
+ $input .= '<option value="'.$key.'"'.$sel.'>'.htmlspecialchars($val, ENT_QUOTES, Kohana::CHARSET, FALSE).'</option>'."\n";
}
}
$input .= '</select>';