diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-09 18:38:05 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-09 18:38:05 -0500 |
| commit | 606e392d40991d2191ef1a07c7f19d4cc2290ec1 (patch) | |
| tree | 951ff64d90fb299ab5f24d669d64786301fffc48 | |
| parent | 7bb32d27ac7505b7dfc05c89be861441b1a52e15 (diff) | |
| parent | 36de18e174c1137904d2f318d4f5eb7db9e96ebc (diff) | |
| download | forums-606e392d40991d2191ef1a07c7f19d4cc2290ec1.tar forums-606e392d40991d2191ef1a07c7f19d4cc2290ec1.tar.gz forums-606e392d40991d2191ef1a07c7f19d4cc2290ec1.tar.bz2 forums-606e392d40991d2191ef1a07c7f19d4cc2290ec1.tar.xz forums-606e392d40991d2191ef1a07c7f19d4cc2290ec1.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11423' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11423:
[ticket/11423] Send unformatted usernames to the email template
| -rw-r--r-- | phpBB/includes/notification/type/post.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/notification/type/topic.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php index ddfa720e5e..d8ffdea81d 100644 --- a/phpBB/includes/notification/type/post.php +++ b/phpBB/includes/notification/type/post.php @@ -216,7 +216,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base } else { - $username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile'); + $username = $this->user_loader->get_username($this->get_data('poster_id'), 'username'); } return array( diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php index 2549b29409..22436d3fb1 100644 --- a/phpBB/includes/notification/type/topic.php +++ b/phpBB/includes/notification/type/topic.php @@ -178,7 +178,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base } else { - $username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile'); + $username = $this->user_loader->get_username($this->get_data('poster_id'), 'username'); } return array( |