diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-25 07:27:21 +0200 |
---|---|---|
committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-25 07:27:21 +0200 |
commit | fa9a7bbb3c61116e5db76c9f25ef2340fef971d7 (patch) | |
tree | cd733e8548290158d578da185bd541e7fe4b1a31 /inc/poche/User.class.php | |
parent | ebd6bf6007e0fad4c3e11dac0e79f687e1d195a2 (diff) | |
parent | 830612f555d8bc72669fe9bc0686680001af0e52 (diff) | |
download | wallabag-fa9a7bbb3c61116e5db76c9f25ef2340fef971d7.tar.gz wallabag-fa9a7bbb3c61116e5db76c9f25ef2340fef971d7.tar.zst wallabag-fa9a7bbb3c61116e5db76c9f25ef2340fef971d7.zip |
Merge branch 'fix/securityAllowedActions' into dev
Diffstat (limited to 'inc/poche/User.class.php')
-rw-r--r-- | inc/poche/User.class.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/inc/poche/User.class.php b/inc/poche/User.class.php index cc8bec65..eaadd3e5 100644 --- a/inc/poche/User.class.php +++ b/inc/poche/User.class.php | |||
@@ -5,7 +5,7 @@ | |||
5 | * @category wallabag | 5 | * @category wallabag |
6 | * @author Nicolas Lœuillet <nicolas@loeuillet.org> | 6 | * @author Nicolas Lœuillet <nicolas@loeuillet.org> |
7 | * @copyright 2013 | 7 | * @copyright 2013 |
8 | * @license http://www.wtfpl.net/ see COPYING file | 8 | * @license http://opensource.org/licenses/MIT see COPYING file |
9 | */ | 9 | */ |
10 | 10 | ||
11 | class User | 11 | class User |
@@ -44,7 +44,14 @@ class User | |||
44 | $this->config = $config; | 44 | $this->config = $config; |
45 | } | 45 | } |
46 | 46 | ||
47 | public function getConfigValue($name) { | 47 | /** |
48 | * Returns configuration entry for a user | ||
49 | * | ||
50 | * @param $name | ||
51 | * @return bool | ||
52 | */ | ||
53 | public function getConfigValue($name) | ||
54 | { | ||
48 | return (isset($this->config[$name])) ? $this->config[$name] : FALSE; | 55 | return (isset($this->config[$name])) ? $this->config[$name] : FALSE; |
49 | } | 56 | } |
50 | } \ No newline at end of file | 57 | } \ No newline at end of file |