diff options
| author | jim-p <jimp@pfsense.org> | 2011-01-06 13:46:13 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-01-06 13:52:52 -0500 |
| commit | d865241eddda66e39cea4e1408171f83d593b3d2 (patch) | |
| tree | 3bf3ecfc5b80e7f65aa130603110fe5dac45ecc5 /usr/local/www/firewall_aliases_edit.php | |
| parent | 19e76a0bdb03bc3e6b6453289844e14e9aa70f5e (diff) | |
| download | pfsense-d865241eddda66e39cea4e1408171f83d593b3d2.zip pfsense-d865241eddda66e39cea4e1408171f83d593b3d2.tar.gz | |
Don't run mb_convert_encoding on descr field, it's cdata protected in the config now and this just causes some characters to be lost on input. Ticket #1168
Diffstat (limited to 'usr/local/www/firewall_aliases_edit.php')
| -rwxr-xr-x | usr/local/www/firewall_aliases_edit.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index 74f7f03..d03c8a4 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -284,7 +284,7 @@ if ($_POST) { if (!$input_errors) { $alias['address'] = is_array($address) ? implode(" ", $address) : $address; - $alias['descr'] = mb_convert_encoding($_POST['descr'],"HTML-ENTITIES","auto"); + $alias['descr'] = $_POST['descr']; $alias['type'] = $_POST['type']; $alias['detail'] = implode("||", $final_address_details); @@ -342,7 +342,7 @@ if ($_POST) { else { $pconfig['name'] = $_POST['name']; - $pconfig['descr'] = mb_convert_encoding($_POST['descr'],"HTML-ENTITIES","auto"); + $pconfig['descr'] = $_POST['descr']; $pconfig['address'] = implode(" ", $address); $pconfig['type'] = $_POST['type']; $pconfig['detail'] = implode("||", $final_address_details); |
