diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-01-18 09:10:36 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-01-18 09:10:36 +0100 |
| commit | 1f74cd2d101f032472a4968a10b64161652d6c1f (patch) | |
| tree | d692513243aaed6003264f0b877b50cbeb69328b /usr/local/www/interfaces_qinq_edit.php | |
| parent | c9d174dfc0a29c59ae35f43a470460f36f695b61 (diff) | |
| parent | 96e889fc1e938187dd18238d80e3163e1aca3006 (diff) | |
| download | pfsense-1f74cd2d101f032472a4968a10b64161652d6c1f.zip pfsense-1f74cd2d101f032472a4968a10b64161652d6c1f.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/interfaces.inc
etc/inc/system.inc
Diffstat (limited to 'usr/local/www/interfaces_qinq_edit.php')
| -rwxr-xr-x | usr/local/www/interfaces_qinq_edit.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/interfaces_qinq_edit.php b/usr/local/www/interfaces_qinq_edit.php index e8b698e..2ffbac9 100755 --- a/usr/local/www/interfaces_qinq_edit.php +++ b/usr/local/www/interfaces_qinq_edit.php @@ -142,7 +142,7 @@ if ($_POST) { if (!$input_errors) { $qinqentry['members'] = $members; - $qinqentry['descr'] = mb_convert_encoding($_POST['descr'],"HTML-ENTITIES","auto"); + $qinqentry['descr'] = $_POST['descr']; $qinqentry['vlanif'] = "{$_POST['if']}_{$_POST['tag']}"; $nmembers = explode(" ", $members); @@ -200,7 +200,7 @@ if ($_POST) { header("Location: interfaces_qinq.php"); exit; } else { - $pconfig['descr'] = mb_convert_encoding($_POST['descr'],"HTML-ENTITIES","auto"); + $pconfig['descr'] = $_POST['descr']; $pconfig['tag'] = $_POST['tag']; $pconfig['members'] = $members; } |
