fixed problems with spaced arrays

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/plugins/config/_test/data/config.php b/lib/plugins/config/_test/data/config.php
index 15d6359ad..83255f937 100644
--- a/lib/plugins/config/_test/data/config.php
+++ b/lib/plugins/config/_test/data/config.php
@@ -10,7 +10,7 @@ $conf['str3']  = "Hello World";
 $conf['str4']  = "Hello 'World'";
 $conf['str5']  = "Hello \"World\"";
 
-$conf['arr1']  = array('foo','bar','baz');
+$conf['arr1']  = array('foo','bar', 'baz');
 
 $conf['foo']['bar'] = 'x1';
 $conf['foo']['baz'] = 'x2';
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 7f15df6fb..7ff310b20 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -166,12 +166,13 @@ if (!class_exists('configuration')) {
 
 
           // handle arrays
-          if(preg_match('/array ?\((.*)\)/', $value, $match)){
+          if(preg_match('/^array ?\((.*)\)/', $value, $match)){
             $arr = explode(',', $match[1]);
 
             // remove quotes from quoted strings & unescape escaped data
             $len = count($arr);
             for($j=0; $j<$len; $j++){
+                $arr[$j] = trim($arr[$j]);
                 $arr[$j] = preg_replace('/^(\'|")(.*)(?<!\\\\)\1$/s','$2',$arr[$j]);
                 $arr[$j] = strtr($arr[$j], array('\\\\'=>'\\','\\\''=>'\'','\\"'=>'"'));
             }