diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-05 14:46:58 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-05 14:46:58 -0500 |
| commit | 597c16a9363858e343480f70b1852bce2bba5ca3 (patch) | |
| tree | 58850042f54213f8941e8086523f647a2cf0dc6b | |
| parent | ce993cd56ef6338c33c68db9ac67f4403a3ca263 (diff) | |
| parent | ab4c1b5d0c07dcf60e4dc41a4b6b4abfec64cd1e (diff) | |
| download | forums-597c16a9363858e343480f70b1852bce2bba5ca3.tar forums-597c16a9363858e343480f70b1852bce2bba5ca3.tar.gz forums-597c16a9363858e343480f70b1852bce2bba5ca3.tar.bz2 forums-597c16a9363858e343480f70b1852bce2bba5ca3.tar.xz forums-597c16a9363858e343480f70b1852bce2bba5ca3.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11400' into develop
# By Nathan Guse
# Via Nathan Guse
* EXreaction/ticket/11400:
[ticket/11400] If email is disabled, disable it for notifications
| -rw-r--r-- | phpBB/includes/notification/method/email.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php index 429dfda2ba..4a7fea6df3 100644 --- a/phpBB/includes/notification/method/email.php +++ b/phpBB/includes/notification/method/email.php @@ -53,8 +53,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_base */ public function is_available() { - // Email is always available - return true; + return (bool) $this->config['email_enable']; } /** |