diff options
author | zottel <github@zottel.net> | 2014-02-20 11:17:07 +0100 |
---|---|---|
committer | zottel <github@zottel.net> | 2014-02-20 11:17:07 +0100 |
commit | 79c566bda33645f42f8545fdc6e55af35c4a7d5c (patch) | |
tree | 7fc573bd9903150b938b11758837b02a1d157008 /mod/settings.php | |
parent | b223b52f83344a7ebdea460cd534d24337f0b403 (diff) | |
parent | d8434bb480ee4f7a94246a8623614a4c3105a2a6 (diff) | |
download | volse-hubzilla-79c566bda33645f42f8545fdc6e55af35c4a7d5c.tar.gz volse-hubzilla-79c566bda33645f42f8545fdc6e55af35c4a7d5c.tar.bz2 volse-hubzilla-79c566bda33645f42f8545fdc6e55af35c4a7d5c.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/settings.php')
-rw-r--r-- | mod/settings.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/settings.php b/mod/settings.php index e9f4c9f8d..b88380ff0 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -261,7 +261,7 @@ function settings_post(&$a) { $maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0); $expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0); $def_group = ((x($_POST,'group-selection')) ? notags(trim($_POST['group-selection'])) : ''); - $channel_menu = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu'])) : ''); + $channel_menu = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu']),ENT_QUOTES) : ''); $expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0); $expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0); |