diff options
author | Christopher Smith <chris@jalakai.co.uk> | 2015-05-18 20:32:49 +0100 |
---|---|---|
committer | Christopher Smith <chris@jalakai.co.uk> | 2015-05-18 20:32:49 +0100 |
commit | 3a7669bd1068f34022db08228baeefae2b27d05b (patch) | |
tree | aaea82b6b73359c895f6844b36cc03d8f326b410 | |
parent | f266a91942e3eb7558afe54062c5e6a7bbcdf9ee (diff) | |
download | rpg-3a7669bd1068f34022db08228baeefae2b27d05b.tar.gz rpg-3a7669bd1068f34022db08228baeefae2b27d05b.tar.bz2 |
Ensure single value negation is not affected by white space
differences
-rw-r--r-- | inc/confutils.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/confutils.php b/inc/confutils.php index e3805d74e..c587bed4d 100644 --- a/inc/confutils.php +++ b/inc/confutils.php @@ -365,12 +365,12 @@ function conf_decodeString($str) { function array_merge_with_removal($current, $new) { foreach ($new as $val) { if (substr($val,0,1) == '!') { - $idx = array_search(substr($val,1),$current); + $idx = array_search(trim(substr($val,1)),$current); if ($idx !== false) { unset($current[$idx]); } } else { - $current[] = $val; + $current[] = trim($val); } } |