diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-01-25 11:12:53 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-01-25 11:12:53 +0100 |
| commit | b303add4e27e10fbdc4ed64f40ab2046232027bf (patch) | |
| tree | 0fa9a95149c6a3eef0e90ae30f27c4a18925fc19 /lib/plugins/config/_test | |
| parent | 33e75ca2f63b10ae1c7c7e9891ae857ce80d1811 (diff) | |
| parent | d12150d88f5fe8d5718313ab6c14ab8c907c61ff (diff) | |
| download | rpg-b303add4e27e10fbdc4ed64f40ab2046232027bf.tar.gz rpg-b303add4e27e10fbdc4ed64f40ab2046232027bf.tar.bz2 | |
Merge branch 'confmanager' into future
* confmanager:
fixed problems with spaced arrays
parse arrays from config file
Diffstat (limited to 'lib/plugins/config/_test')
| -rw-r--r-- | lib/plugins/config/_test/configuration.test.php | 2 | ||||
| -rw-r--r-- | lib/plugins/config/_test/data/config.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/config/_test/configuration.test.php b/lib/plugins/config/_test/configuration.test.php index ee03f3849..b808ad505 100644 --- a/lib/plugins/config/_test/configuration.test.php +++ b/lib/plugins/config/_test/configuration.test.php @@ -30,4 +30,4 @@ class plugin_config_configuration_test extends DokuWikiTest { $this->assertEquals(array('foo', 'bar', 'baz'), $conf['arr1']); } -}
\ No newline at end of file +} 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'; |