aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-05-12 22:41:00 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-05-12 22:41:00 +0200
commit7e70eec5a37ddfe112e12b976821c5b944128d32 (patch)
treebc5c4b8d279474dc78207f72d65915d2b4ff1064 /phpBB/includes/functions_user.php
parentf90ed6c3cb9e1b8baeb352a07b81608fa7c067b5 (diff)
parentfe13b89dd4bd6d808d81c903e66fe869ccd43050 (diff)
downloadforums-7e70eec5a37ddfe112e12b976821c5b944128d32.tar
forums-7e70eec5a37ddfe112e12b976821c5b944128d32.tar.gz
forums-7e70eec5a37ddfe112e12b976821c5b944128d32.tar.bz2
forums-7e70eec5a37ddfe112e12b976821c5b944128d32.tar.xz
forums-7e70eec5a37ddfe112e12b976821c5b944128d32.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index bc636acabb..599cb24f75 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2924,8 +2924,7 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
{
$messenger->template('group_approved', $row['user_lang']);
- $messenger->to($row['user_email'], $row['username']);
- $messenger->im($row['user_jabber'], $row['username']);
+ $messenger->set_addresses($row);
$messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($row['username']),