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 /lib/lib_rss.php | |
| parent | 1914ce9207a95f5b5ed88e226aa8999df79f67e6 (diff) | |
| parent | 68d3deee1e1d5480bff1a61547188576e13ffcb4 (diff) | |
Merge pull request #1532 from Alkarex/move-default-configs
Move default configuration files
Diffstat (limited to 'lib/lib_rss.php')
| -rw-r--r-- | lib/lib_rss.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 247cc707b..7e14e638d 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -214,7 +214,7 @@ function customSimplePie() { ), )); $https_domains = array(); - $force = @file(DATA_PATH . '/force-https.default.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); + $force = @file(FRESHRSS_PATH . '/force-https.default.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); if (is_array($force)) { $https_domains = array_merge($https_domains, $force); } @@ -341,7 +341,7 @@ function get_user_configuration($username) { try { Minz_Configuration::register($namespace, join_path(USERS_PATH, $username, 'config.php'), - join_path(USERS_PATH, '_', 'config.default.php')); + join_path(FRESHRSS_PATH, 'config-user.default.php')); } catch (Minz_ConfigurationNamespaceException $e) { // namespace already exists, do nothing. } catch (Minz_FileNotExistException $e) { |