From 32d25dafd5b033338b6a9bb8c7c53edab462543a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 25 Dec 2009 21:05:39 -0800
Subject: 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
---
 system/helpers/form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/helpers')

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>';
-- 
cgit v1.2.3