aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-06 18:53:36 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-06 18:53:36 +0100
commitd3a93ea2905ae50a2365d293f9f3ef3e51bf5f30 (patch)
treefbf240e82b244fc19907529750dd8be912d97b4b /data
parentd27efeec04c7c41cf0f52bc7f89879e66f2e44a9 (diff)
BREAKING FEATURE: Remove general in config
General attribute has been removed from system config. Now subattributes (e.g. environment, salt, title, etc.) are directly accessible. YOU HAVE TO FIX YOUR ./data/config.php file! - Remove the general array - Values inside this array must be kept - To see what it must look like, please have a look to ./data/config.default.php (but keep your values!!). See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'data')
-rw-r--r--data/config.default.php24
1 files changed, 11 insertions, 13 deletions
diff --git a/data/config.default.php b/data/config.default.php
index a69d8050b..193ac5726 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -1,19 +1,17 @@
<?php
return array(
- 'general' => array(
- 'environment' => 'production',
- 'salt' => '',
- 'base_url' => '',
- 'language' => 'en',
- 'title' => 'FreshRSS',
- 'default_user' => '_',
- 'allow_anonymous' => false,
- 'allow_anonymous_refresh' => false,
- 'auth_type' => 'none',
- 'api_enabled' => false,
- 'unsafe_autologin_enabled' => false,
- ),
+ 'environment' => 'production',
+ 'salt' => '',
+ 'base_url' => '',
+ 'language' => 'en',
+ 'title' => 'FreshRSS',
+ 'default_user' => '_',
+ 'allow_anonymous' => false,
+ 'allow_anonymous_refresh' => false,
+ 'auth_type' => 'none',
+ 'api_enabled' => false,
+ 'unsafe_autologin_enabled' => false,
'limits' => array(
'cache_duration' => 800,
'timeout' => 10,