aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-03-17 19:54:32 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-03-17 19:54:32 +0100
commit58d7acbf5a4483f7e2ebac6d9ed38189c48facfb (patch)
tree5b24bb2b112d3e4d4e3f829d7fb93ab864c9b7fe
parent51c1ba12c119127263fa82964d8f6e0ef6eccf87 (diff)
downloadforums-58d7acbf5a4483f7e2ebac6d9ed38189c48facfb.tar
forums-58d7acbf5a4483f7e2ebac6d9ed38189c48facfb.tar.gz
forums-58d7acbf5a4483f7e2ebac6d9ed38189c48facfb.tar.bz2
forums-58d7acbf5a4483f7e2ebac6d9ed38189c48facfb.tar.xz
forums-58d7acbf5a4483f7e2ebac6d9ed38189c48facfb.zip
[ticket/11452] Now notification_method_email checks whether user has address.
Make sure the user has an email address set before offering email notifications. The address could be missing for whatever reason, e.g. external authentication. This is also consistent with XMPP/Jabber now. PHPBB3-11452
-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 4a7fea6df3..2cd1ba3ef6 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -53,7 +53,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
*/
public function is_available()
{
- return (bool) $this->config['email_enable'];
+ return $this->config['email_enable'] && $this->user->data['user_email'];
}
/**