aboutsummaryrefslogtreecommitdiff
path: root/app/Models/Context.php
diff options
context:
space:
mode:
Diffstat (limited to 'app/Models/Context.php')
-rw-r--r--app/Models/Context.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Models/Context.php b/app/Models/Context.php
index c8a65063a..9bbad9857 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -41,10 +41,10 @@ class FreshRSS_Context {
*/
public static function init() {
// Init configuration.
- $current_user = Minz_Session::param('currentUser');
try {
- self::$conf = new FreshRSS_Configuration($current_user);
+ self::$conf = Minz_Configuration::get('user');
} catch(Minz_Exception $e) {
+ $current_user = Minz_Session::param('currentUser', '_');
Minz_Log::error('Cannot load configuration file of user `' . $current_user . '`');
die($e->getMessage());
}