diff options
| author | Cesar G <prototech91@gmail.com> | 2013-12-01 12:20:43 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-03-19 03:08:33 -0700 |
| commit | b32a66ca78b6170c0d90b7776dabdf8f343c557a (patch) | |
| tree | e0930d20e3f90b13fbf8dedab6c4f54b36f9f36b /phpBB/phpbb | |
| parent | 126ee37f6692a7c52fd8f6527af2dc06cda50a8b (diff) | |
| download | forums-b32a66ca78b6170c0d90b7776dabdf8f343c557a.tar forums-b32a66ca78b6170c0d90b7776dabdf8f343c557a.tar.gz forums-b32a66ca78b6170c0d90b7776dabdf8f343c557a.tar.bz2 forums-b32a66ca78b6170c0d90b7776dabdf8f343c557a.tar.xz forums-b32a66ca78b6170c0d90b7776dabdf8f343c557a.zip | |
[ticket/11959] List the last user with "and" instead of a comma.
PHPBB3-11959
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/notification/type/post.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php index a883e67bd4..944023cba4 100644 --- a/phpBB/phpbb/notification/type/post.php +++ b/phpBB/phpbb/notification/type/post.php @@ -205,6 +205,7 @@ class post extends \phpbb\notification\type\base $usernames[] = $this->user_loader->get_username($responder['poster_id'], 'no_profile'); } } + $last_user = ''; $lang_key = $this->language_key; if ($trimmed_responders_cnt) @@ -215,11 +216,17 @@ class post extends \phpbb\notification\type\base else { $lang_user_cnt = $responders_cnt; + + if ($responders_cnt > 1) + { + $last_user = array_pop($usernames); + } } return $this->user->lang( $lang_key, implode($this->user->lang['COMMA_SEPARATOR'], $usernames), + $last_user, censor_text($this->get_data('topic_title')), $lang_user_cnt ); |