diff options
| author | 2015-01-06 22:43:24 +0100 | |
|---|---|---|
| committer | 2015-01-06 22:43:24 +0100 | |
| commit | 8e6ab12e89504e3c44f766d319ac00cc7d58810a (patch) | |
| tree | 878a70cc161a693717e523c190cf5f0366317303 /lib/lib_rss.php | |
| parent | ce9298439b882d64c403eded1575db8f029aa389 (diff) | |
Fix a bug in FreshRSS_Auth::giveAccess()
See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'lib/lib_rss.php')
| -rw-r--r-- | lib/lib_rss.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 8bfc6eb10..14b6e854d 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -253,10 +253,14 @@ function get_user_configuration($username) { Minz_Configuration::register($namespace, join_path(USERS_PATH, $username, 'config.php'), join_path(USERS_PATH, '_', 'config.default.php')); - return Minz_Configuration::get($namespace); - } catch(Minz_ConfigurationException $e) { + } catch (Minz_ConfigurationNamespaceException $e) { + // namespace already exists, do nothing. + } catch (Minz_FileNotExistException $e) { + Minz_Log::warning($e->getMessage()); return null; } + + return Minz_Configuration::get($namespace); } |
