diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-05-13 20:11:43 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-05-13 20:11:43 +0200 |
| commit | 431683eb3d118a1072999e899ab2faf3cf58a5e4 (patch) | |
| tree | eb1aa893b67ada2d5b04793a90f133695e1f1472 /app | |
| parent | 1914ce9207a95f5b5ed88e226aa8999df79f67e6 (diff) | |
| parent | 68d3deee1e1d5480bff1a61547188576e13ffcb4 (diff) | |
Merge pull request #1532 from Alkarex/move-default-configs
Move default configuration files
Diffstat (limited to 'app')
| -rw-r--r-- | app/FreshRSS.php | 2 | ||||
| -rw-r--r-- | app/install.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/FreshRSS.php b/app/FreshRSS.php index e4caf23d1..563393c90 100644 --- a/app/FreshRSS.php +++ b/app/FreshRSS.php @@ -41,7 +41,7 @@ class FreshRSS extends Minz_FrontController { $current_user = Minz_Session::param('currentUser', '_'); Minz_Configuration::register('user', join_path(USERS_PATH, $current_user, 'config.php'), - join_path(USERS_PATH, '_', 'config.default.php'), + join_path(FRESHRSS_PATH, 'config-user.default.php'), $configuration_setter); // Finish to initialize the other FreshRSS / Minz components. diff --git a/app/install.php b/app/install.php index ebfffa47d..9e474ca73 100644 --- a/app/install.php +++ b/app/install.php @@ -88,13 +88,13 @@ function saveStep1() { // First, we try to get previous configurations Minz_Configuration::register('system', join_path(DATA_PATH, 'config.php'), - join_path(DATA_PATH, 'config.default.php')); + join_path(FRESHRSS_PATH, 'config.default.php')); $system_conf = Minz_Configuration::get('system'); $current_user = $system_conf->default_user; Minz_Configuration::register('user', join_path(USERS_PATH, $current_user, 'config.php'), - join_path(USERS_PATH, '_', 'config.default.php')); + join_path(FRESHRSS_PATH, 'config-user.default.php')); $user_conf = Minz_Configuration::get('user'); // Then, we set $_SESSION vars |