aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/notification/method/email.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-06-03 22:42:49 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-06-03 22:42:49 +0200
commitaf8c4b29009548fd1a28c3210c4734d84e4ebb48 (patch)
tree12a0bec1c9e91484534c7737afc9d06c6ee95b9d /phpBB/includes/notification/method/email.php
parent79823b9cafb41f4f9405c6a5bf7e0c46b0aa751b (diff)
parent74da9e32e5a3eafb942c4a5ab58c642654cf582e (diff)
downloadforums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.tar
forums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.tar.gz
forums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.tar.bz2
forums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.tar.xz
forums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531
Diffstat (limited to 'phpBB/includes/notification/method/email.php')
-rw-r--r--phpBB/includes/notification/method/email.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index 44666b1422..571b0ec656 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -39,7 +39,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_messenge
*/
public function is_available()
{
- return (bool) $this->config['email_enable'];
+ return $this->config['email_enable'] && $this->user->data['user_email'];
}
/**