From 9c6682e7edf8cbad828088cbeeef66c7ecefdd9a Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 2 Jan 2021 21:20:19 +0100 Subject: 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 --- app/Controllers/errorController.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/Controllers/errorController.php') diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php index a5f901fd4..ce6024406 100644 --- a/app/Controllers/errorController.php +++ b/app/Controllers/errorController.php @@ -33,10 +33,12 @@ class FreshRSS_error_Controller extends Minz_ActionController { case 500: header('HTTP/1.1 500 Internal Server Error'); $this->view->code = 'Error 500 - Internal Server Error'; + $this->view->errorMessage = 'Error 500 - Internal Server Error'; break; case 503: header('HTTP/1.1 503 Service Unavailable'); $this->view->code = 'Error 503 - Service Unavailable'; + $this->view->errorMessage = 'Error 503 - Service Unavailable'; break; case 404: default: -- cgit v1.2.3