aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2020-04-20 17:48:41 +0200
committerGravatar GitHub <noreply@github.com> 2020-04-20 17:48:41 +0200
commit582a0041a9de7896813d63c38aef1312fe23a188 (patch)
tree745fe3651949f9bf89bb1df042ad0dd3efad30e4 /app
parentf8db9ddd8585a7e0fb90bbb51121bacf1e515254 (diff)
Don't check email if feature disabled or for admin (#2917)
Diffstat (limited to 'app')
-rw-r--r--app/FreshRSS.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 2754074b0..32c3c39d0 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -54,7 +54,9 @@ class FreshRSS extends Minz_FrontController {
Minz_ExtensionManager::enableByList($ext_list);
}
- self::checkEmailValidated();
+ if ($system_conf->force_email_validation && !FreshRSS_Auth::hasAccess('admin')) {
+ self::checkEmailValidated();
+ }
Minz_ExtensionManager::callHook('freshrss_init');
}