diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-18 18:31:33 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-18 18:31:33 +0100 |
| commit | c6f4f85e27a10459422ab9789c894d13f0cd34c7 (patch) | |
| tree | 6b4cf7a304242c5891952b428b3bca950924f309 /lib/public/config.php | |
| parent | 9fac95c2ab46a734607657bbad6f164aaa61286f (diff) | |
| parent | 8991e4505adba2dae8afe7b7941ec744bfe78712 (diff) | |
| download | nextcloud-server-c6f4f85e27a10459422ab9789c894d13f0cd34c7.tar.gz nextcloud-server-c6f4f85e27a10459422ab9789c894d13f0cd34c7.zip | |
Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
lib/private/migration/content.php
Diffstat (limited to 'lib/public/config.php')
| -rw-r--r-- | lib/public/config.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/public/config.php b/lib/public/config.php index 2d450e0d0d2..bb973939f44 100644 --- a/lib/public/config.php +++ b/lib/public/config.php @@ -42,7 +42,7 @@ class Config { /** * Gets a value from config.php * @param string $key key - * @param string $default = null default value + * @param mixed $default = null default value * @return string the value or $default * * This function gets the value from config.php. If it does not exist, @@ -55,7 +55,7 @@ class Config { /** * Sets a value * @param string $key key - * @param string $value value + * @param mixed $value value * @return bool * * This function sets the value and writes the config.php. If the file can |