diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2021-01-02 21:20:19 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-01-02 21:20:19 +0100 |
| commit | 9c6682e7edf8cbad828088cbeeef66c7ecefdd9a (patch) | |
| tree | c8c8a6ba34d49d22497a14ddaf18ae97d8cd5bb1 /p/api/index.php | |
| parent | 7bc2cc5825547f5b5cf15005fda937e06065b45d (diff) | |
Avoid manual initialisations of system or user configuration (#3070)
* Avoid manual intialisations of system or user configuration
More consistent use of Context
* Simplify FreshRSS_Context::initUser
* Remove a few manual get_user_configuration
* A bit of debugging
* Fix context user init
* Fix install
* Fix concurrency
Concurrent requests could lead to bad race condition
* Fix actualize cron
Fix case when system i initialised several times
Diffstat (limited to 'p/api/index.php')
| -rw-r--r-- | p/api/index.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/p/api/index.php b/p/api/index.php index d441099d7..6ca7e1b6d 100644 --- a/p/api/index.php +++ b/p/api/index.php @@ -10,7 +10,7 @@ <?php require(__DIR__ . '/../../constants.php'); require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader -Minz_Configuration::register('system', DATA_PATH . '/config.php', FRESHRSS_PATH . '/config.default.php'); +FreshRSS_Context::initSystem(); echo json_encode(array( 'greader' => Minz_Url::display('/api/greader.php', 'php', true), 'fever' => Minz_Url::display('/api/fever.php', 'php', true), |