2 files changed, 39 insertions, 5 deletions
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php
index d77a936413..2e8652771b 100644
--- a/phpBB/phpbb/notification/manager.php
+++ b/phpBB/phpbb/notification/manager.php
@@ -27,6 +27,9 @@ class manager
 	/** @var \phpbb\user_loader */
 	protected $user_loader;
 
+	/** @var \phpbb\config\config */
+	protected $config;
+
 	/** @var \phpbb\db\driver\driver */
 	protected $db;
 
@@ -58,6 +61,7 @@ class manager
 	* @param array $notification_methods
 	* @param ContainerBuilder $phpbb_container
 	* @param \phpbb\user_loader $user_loader
+	* @param \phpbb\config\config $config
 	* @param \phpbb\db\driver\driver $db
 	* @param \phpbb\user $user
 	* @param string $phpbb_root_path
@@ -67,13 +71,14 @@ class manager
 	* @param string $user_notifications_table
 	* @return \phpbb\notification\manager
 	*/
-	public function __construct($notification_types, $notification_methods, $phpbb_container, \phpbb\user_loader $user_loader, \phpbb\db\driver\driver $db, \phpbb\cache\service $cache, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
+	public function __construct($notification_types, $notification_methods, $phpbb_container, \phpbb\user_loader $user_loader, \phpbb\config\config $config, \phpbb\db\driver\driver $db, \phpbb\cache\service $cache, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
 	{
 		$this->notification_types = $notification_types;
 		$this->notification_methods = $notification_methods;
 		$this->phpbb_container = $phpbb_container;
 
 		$this->user_loader = $user_loader;
+		$this->config = $config;
 		$this->db = $db;
 		$this->cache = $cache;
 		$this->user = $user;
@@ -797,6 +802,8 @@ class manager
 			WHERE notification_time < ' . (int) $timestamp .
 				(($only_read) ? ' AND notification_read = 1' : '');
 		$this->db->sql_query($sql);
+
+		$this->config->set('read_notification_last_gc', time(), false);
 	}
 
 	/**
diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php
index 9d5c7b0a4c..c2854c17af 100644
--- a/phpBB/phpbb/notification/type/post.php
+++ b/phpBB/phpbb/notification/type/post.php
@@ -183,6 +183,10 @@ class post extends \phpbb\notification\type\base
 			'username'		=> $this->get_data('post_username'),
 		)), $responders);
 
+		$responders_cnt = sizeof($responders);
+		$responders = $this->trim_user_ary($responders);
+		$trimmed_responders_cnt = $responders_cnt - sizeof($responders);
+
 		foreach ($responders as $responder)
 		{
 			if ($responder['username'])
@@ -194,11 +198,18 @@ class post extends \phpbb\notification\type\base
 				$usernames[] = $this->user_loader->get_username($responder['poster_id'], 'no_profile');
 			}
 		}
+		$lang_key = $this->language_key;
+
+		if ($trimmed_responders_cnt)
+		{
+			$lang_key .= '_TRIMMED';
+		}
 
 		return $this->user->lang(
-			$this->language_key,
-			implode(', ', $usernames),
-			censor_text($this->get_data('topic_title'))
+			$lang_key,
+			implode($this->user->lang['COMMA_SEPARATOR'], $usernames),
+			censor_text($this->get_data('topic_title')),
+			$trimmed_responders_cnt
 		);
 	}
 
@@ -234,7 +245,7 @@ class post extends \phpbb\notification\type\base
 			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
 
 			'U_VIEW_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
-			'U_NEWEST_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
+			'U_NEWEST_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&e=1&view=unread#unread",
 			'U_TOPIC'					=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
 			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
 			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->get_data('forum_id')}",
@@ -272,6 +283,22 @@ class post extends \phpbb\notification\type\base
 			}
 		}
 
+		return $this->trim_user_ary($users);
+	}
+
+	/**
+	* Trim the user array passed down to 3 users if the array contains
+	* more than 4 users.
+	*
+	* @param array $users Array of users
+	* @return array Trimmed array of user_ids
+	*/
+	public function trim_user_ary($users)
+	{
+		if (sizeof($users) > 4)
+		{
+			array_splice($users, 3);
+		}
 		return $users;
 	}