Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattpiwik <matthieu.aubry@gmail.com>2009-03-02 06:45:21 +0300
committermattpiwik <matthieu.aubry@gmail.com>2009-03-02 06:45:21 +0300
commit121f19e62a878dbe60874a691ccde13e303fdb0c (patch)
treea447f8189114703a07709d54291a2bf523bd1bc5 /tests/resources/Config
parentb96108981d157e1a890a13c32caa5c4857c8ec56 (diff)
- fix #481 (username should be enclosed in double quotes in config files, in case the user name contains a =
--> all non-array values in Config/config.ini.php are now automatically enclosed in double quotes, and double quote automatically encoded as &quot; (parse_ini_file doesn't handle escaping the double quote, arg) - cleaning the Piwik_Config code, adding tests, the code using the Config is now more simple, all the logic is inside the class (before it was very hacky). the installer is now using the Config to create the config file rather than duplicating the logic. git-svn-id: http://dev.piwik.org/svn/trunk@949 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'tests/resources/Config')
-rw-r--r--tests/resources/Config/config.ini.php2
-rw-r--r--tests/resources/Config/global.ini.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/resources/Config/config.ini.php b/tests/resources/Config/config.ini.php
index 8b99401fb9..cd610e1646 100644
--- a/tests/resources/Config/config.ini.php
+++ b/tests/resources/Config/config.ini.php
@@ -1,5 +1,5 @@
[General]
-login=test
+login="tes&quot;t"
password=test
[Category]
diff --git a/tests/resources/Config/global.ini.php b/tests/resources/Config/global.ini.php
index 05bd172203..c9786a12ca 100644
--- a/tests/resources/Config/global.ini.php
+++ b/tests/resources/Config/global.ini.php
@@ -3,4 +3,5 @@ key1 = value1
key2 = value2
[CategoryOnlyInGlobalFile]
-key3 = value3 \ No newline at end of file
+key3 = "value3"
+key4 = value4 \ No newline at end of file