22 files changed, 327 insertions, 14 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index fd4241a759..3ab3fc65da 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -1455,6 +1455,22 @@ viewtopic_body_poll_question_prepend
 * Since: 3.1.0-b3
 * Purpose: Add content directly before the poll question on the View topic screen
 
+viewtopic_body_post_author_after
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+    + styles/subsilver2/template/viewtopic_body.html
+* Since: 3.1.3-RC1
+* Purpose: Add content directly after the post author on the view topic screen
+
+viewtopic_body_post_author_before
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+    + styles/subsilver2/template/viewtopic_body.html
+* Since: 3.1.3-RC1
+* Purpose: Add content directly before the post author on the view topic screen
+
 viewtopic_body_post_buttons_after
 ===
 * Locations:
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 4671a026eb..fcc2bd7641 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -40,7 +40,7 @@ class acp_email
 		$error = array();
 
 		$usernames	= request_var('usernames', '', true);
-		$usernames	= explode("\n", $usernames);
+		$usernames	= (!empty($usernames)) ? explode("\n", $usernames) : array();
 		$group_id	= request_var('g', 0);
 		$subject	= utf8_normalize_nfc(request_var('subject', '', true));
 		$message	= utf8_normalize_nfc(request_var('message', '', true));
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index ca9efc8d53..881e50dd5a 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -183,7 +183,7 @@ class acp_users
 				 * @var	bool    submit      Do we display the form only
 				 *                          or did the user press submit
 				 * @var	array   error       Array holding error messages
-				 * @since 3.1.3
+				 * @since 3.1.3-RC1
 				 */
 				$vars = array('user_row', 'mode', 'action', 'submit', 'error');
 				extract($phpbb_dispatcher->trigger_event('core.acp_users_overview_before', compact($vars)));
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 3460db4882..5f6dcde448 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -129,7 +129,7 @@ class bbcode
 	*/
 	function bbcode_cache_init()
 	{
-		global $phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager, $phpbb_path_helper;
+		global $phpbb_root_path, $phpEx, $config, $user, $phpbb_dispatcher, $phpbb_extension_manager, $phpbb_path_helper;
 
 		if (empty($this->template_filename))
 		{
@@ -388,6 +388,26 @@ class bbcode
 				break;
 			}
 		}
+
+		$bbcode_cache = $this->bbcode_cache;
+		$bbcode_bitfield = $this->bbcode_bitfield;
+		$bbcode_uid = $this->bbcode_uid;
+
+		/**
+		* Use this event to modify the bbcode_cache
+		*
+		* @event core.bbcode_cache_init_end
+		* @var	array	bbcode_cache		The array of cached search and replace patterns of bbcodes
+		* @var	string	bbcode_bitfield		The bbcode bitfield
+		* @var	string	bbcode_uid			The bbcode uid
+		* @since 3.1.3-RC1
+		*/
+		$vars = array('bbcode_cache', 'bbcode_bitfield', 'bbcode_uid');
+		extract($phpbb_dispatcher->trigger_event('core.bbcode_cache_init_end', compact($vars)));
+
+		$this->bbcode_cache = $bbcode_cache;
+		$this->bbcode_bitfield = $bbcode_bitfield;
+		$this->bbcode_uid = $bbcode_uid;
 	}
 
 	/**
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 81e296e9c9..a016f8e62a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2931,7 +2931,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
 		 * @var string  username    User name used to login
 		 * @var string  password    Password used to login
 		 * @var string  err         Error message
-		 * @since 3.1.3
+		 * @since 3.1.3-RC1
 		 */
 		$vars = array('result', 'username', 'password', 'err');
 		extract($phpbb_dispatcher->trigger_event('core.login_box_failed', compact($vars)));
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 0b9ea23fe7..b016659541 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2311,7 +2311,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 */
 function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync = true)
 {
-	global $db;
+	global $db, $phpbb_dispatcher;
 
 	if (!is_array($forum_id))
 	{
@@ -2351,6 +2351,21 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync
 		$sql_and .= ' AND topic_status = ' . ITEM_MOVED . " AND topic_last_post_time < $prune_date";
 	}
 
+	/**
+	* Use this event to modify the SQL that selects topics to be pruned
+	*
+	* @event core.prune_sql
+	* @var string	forum_id		The forum id
+	* @var string	prune_mode		The prune mode
+	* @var string	prune_date		The prune date
+	* @var int		prune_flags		The prune flags
+	* @var bool		auto_sync		Whether or not to perform auto sync
+	* @var string	sql_and			SQL text appended to where clause
+	* @since 3.1.3-RC1
+	*/
+	$vars = array('forum_id', 'prune_mode', 'prune_date', 'prune_flags', 'auto_sync', 'sql_and');
+	extract($phpbb_dispatcher->trigger_event('core.prune_sql', compact($vars)));
+
 	$sql = 'SELECT topic_id
 		FROM ' . TOPICS_TABLE . '
 		WHERE ' . $db->sql_in_set('forum_id', $forum_id) . "
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index af44f6270e..22ade15b48 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1825,6 +1825,30 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		break;
 	}
 
+	/**
+	* Modify sql query data for post submitting
+	*
+	* @event core.submit_post_modify_sql_data
+	* @var	array	data				Array with the data for the post
+	* @var	array	poll				Array with the poll data for the post
+	* @var	string	post_mode			Variable containing posting mode value
+	* @var	bool	sql_data			Array with the data for the posting SQL query
+	* @var	string	subject				Variable containing post subject value
+	* @var	int		topic_type			Variable containing topic type value
+	* @var	string	username			Variable containing post author name
+	* @since 3.1.3-RC1
+	*/
+	$vars = array(
+		'data',
+		'poll',
+		'post_mode',
+		'sql_data',
+		'subject',
+		'topic_type',
+		'username',
+	);
+	extract($phpbb_dispatcher->trigger_event('core.submit_post_modify_sql_data', compact($vars)));
+
 	// Submit new topic
 	if ($post_mode == 'post')
 	{
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 12ef94c07a..9a67473cf9 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1172,13 +1172,18 @@ class parse_message extends bbcode_firstpass
 		* @var bool		update_this_message		Do we alter the parsed message
 		* @var string	mode					Posting mode
 		* @var string	message					The message text to parse
+		* @var string	bbcode_bitfield			The bbcode_bitfield before parsing
+		* @var string	bbcode_uid				The bbcode_uid before parsing
 		* @var bool		return					Do we return after the event is triggered if $warn_msg is not empty
 		* @var array	warn_msg				Array of the warning messages
 		* @since 3.1.2-RC1
+		* @change 3.1.3-RC1 Added vars $bbcode_bitfield and $bbcode_uid
 		*/
 		$message = $this->message;
 		$warn_msg = $this->warn_msg;
 		$return = false;
+		$bbcode_bitfield = $this->bbcode_bitfield;
+		$bbcode_uid = $this->bbcode_uid;
 		$vars = array(
 			'allow_bbcode',
 			'allow_magic_url',
@@ -1190,12 +1195,16 @@ class parse_message extends bbcode_firstpass
 			'update_this_message',
 			'mode',
 			'message',
+			'bbcode_bitfield',
+			'bbcode_uid',
 			'return',
 			'warn_msg',
 		);
 		extract($phpbb_dispatcher->trigger_event('core.message_parser_check_message', compact($vars)));
 		$this->message = $message;
 		$this->warn_msg = $warn_msg;
+		$this->bbcode_bitfield = $bbcode_bitfield;
+		$this->bbcode_uid = $bbcode_uid;
 		if ($return && !empty($this->warn_msg))
 		{
 			return (!$update_this_message) ? $return_message : $this->warn_msg;
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 103262b516..3bcf5c4f94 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -2083,7 +2083,7 @@ class install_install extends module
 		return array(
 			'language'		=> basename(request_var('language', '')),
 			'dbms'			=> request_var('dbms', ''),
-			'dbhost'		=> request_var('dbhost', ''),
+			'dbhost'		=> request_var('dbhost', '', true),
 			'dbport'		=> request_var('dbport', ''),
 			'dbuser'		=> request_var('dbuser', ''),
 			'dbpasswd'		=> request_var('dbpasswd', '', true),
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index 25765b1af7..f9d46db528 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -137,6 +137,28 @@ if ($forum_id && !$auth->acl_get('f_read', $forum_id))
 	trigger_error('NOT_AUTHORISED');
 }
 
+/**
+* Allow applying additional permissions to MCP access besides f_read
+*
+* @event core.mcp_global_f_read_auth_after
+* @var	string		action			The action the user tried to execute
+* @var	int			forum_id		The forum the user tried to access
+* @var	string		mode			The MCP module the user is trying to access
+* @var	p_master	module			Module system class
+* @var	bool		quickmod		True if the user is accessing using quickmod tools
+* @var	int			topic_id		The topic the user tried to access
+* @since 3.1.3-RC1
+*/
+$vars = array(
+	'action',
+	'forum_id',
+	'mode',
+	'module',
+	'quickmod',
+	'topic_id',
+);
+extract($phpbb_dispatcher->trigger_event('core.mcp_global_f_read_auth_after', compact($vars)));
+
 if ($forum_id)
 {
 	$module->acl_forum_id = $forum_id;
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 5a5be6f761..e64dab635b 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -173,6 +173,22 @@ switch ($mode)
 			'ORDER_BY'	=> 'u.username_clean ASC',
 		);
 
+		/**
+		 * Modify the query used to get the users for the team page
+		 *
+		 * @event core.memberlist_team_modify_query
+		 * @var array	sql_ary			Array containing the query
+		 * @var array	group_ids		Array of group ids
+		 * @var array	teampage_data	The teampage data
+		 * @since 3.1.3-RC1
+		 */
+		$vars = array(
+			'sql_ary',
+			'group_ids',
+			'teampage_data',
+		);
+		extract($phpbb_dispatcher->trigger_event('core.memberlist_team_modify_query', compact($vars)));
+
 		$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
 
 		$user_ary = $user_ids = $group_users = array();
@@ -285,7 +301,7 @@ switch ($mode)
 
 						$user_rank_data = phpbb_get_user_rank($row, (($row['user_id'] == ANONYMOUS) ? false : $row['user_posts']));
 
-						$template->assign_block_vars('group.user', array(
+						$template_vars = array(
 							'USER_ID'		=> $row['user_id'],
 							'FORUMS'		=> $row['forums'],
 							'FORUM_OPTIONS'	=> (isset($row['forums_options'])) ? true : false,
@@ -304,7 +320,25 @@ switch ($mode)
 							'USERNAME'			=> get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
 							'USER_COLOR'		=> get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
 							'U_VIEW_PROFILE'	=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
-						));
+						);
+
+						/**
+						 * Modify the template vars for displaying the user in the groups on the teampage
+						 *
+						 * @event core.memberlist_team_modify_template_vars
+						 * @var array	template_vars		Array containing the query
+						 * @var array	row					Array containing the action user row
+						 * @var array	groups_ary			Array of groups with all users that should be displayed
+						 * @since 3.1.3-RC1
+						 */
+						$vars = array(
+							'template_vars',
+							'row',
+							'groups_ary',
+						);
+						extract($phpbb_dispatcher->trigger_event('core.memberlist_team_modify_template_vars', compact($vars)));
+
+						$template->assign_block_vars('group.user', $template_vars);
 
 						if ($config['teampage_memberships'] != 2)
 						{
diff --git a/phpBB/phpbb/config/db.php b/phpBB/phpbb/config/db.php
index ef20ebf62a..26489bdd34 100644
--- a/phpBB/phpbb/config/db.php
+++ b/phpBB/phpbb/config/db.php
@@ -145,9 +145,9 @@ class db extends \phpbb\config\config
 			$sql .= " AND config_value = '" . $this->db->sql_escape($old_value) . "'";
 		}
 
-		$result = $this->db->sql_query($sql);
+		$this->db->sql_query($sql);
 
-		if (!$this->db->sql_affectedrows($result) && isset($this->config[$key]))
+		if (!$this->db->sql_affectedrows() && isset($this->config[$key]))
 		{
 			return false;
 		}
diff --git a/phpBB/phpbb/db/migration/data/v31x/plupload_last_gc_dynamic.php b/phpBB/phpbb/db/migration/data/v31x/plupload_last_gc_dynamic.php
new file mode 100644
index 0000000000..0783d707c5
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v31x/plupload_last_gc_dynamic.php
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v31x;
+
+class plupload_last_gc_dynamic extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array('\phpbb\db\migration\data\v31x\v312');
+	}
+
+	public function update_data()
+	{
+		return array(
+			// Make plupload_last_gc dynamic.
+			array('config.remove', array('plupload_last_gc')),
+			array('config.add', array('plupload_last_gc', 0, 1)),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php
index db43046a95..035625b095 100644
--- a/phpBB/phpbb/db/migration/tool/module.php
+++ b/phpBB/phpbb/db/migration/tool/module.php
@@ -475,6 +475,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
 		if (!class_exists('acp_modules'))
 		{
 			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
+			$this->user->add_lang('acp/modules');
 		}
 		$acp_modules = new \acp_modules();
 		$module = $acp_modules->get_module_infos($basename, $class, true);
diff --git a/phpBB/phpbb/error_collector.php b/phpBB/phpbb/error_collector.php
index 7141f83174..bf8efd1065 100644
--- a/phpBB/phpbb/error_collector.php
+++ b/phpBB/phpbb/error_collector.php
@@ -16,15 +16,28 @@ namespace phpbb;
 class error_collector
 {
 	var $errors;
+	var $error_types;
 
-	function __construct()
+	/**
+	 * Constructor.
+	 *
+	 * The variable $error_types may be set to a mask of PHP error types that
+	 * the collector should keep, e.g. `E_ALL`. If unset, the current value of
+	 * the error_reporting() function will be used to determine which errors
+	 * the collector will keep.
+	 *
+	 * @see PHPBB3-13306
+	 * @param int|null $error_types
+	 */
+	function __construct($error_types = null)
 	{
 		$this->errors = array();
+		$this->error_types = $error_types;
 	}
 
 	function install()
 	{
-		set_error_handler(array(&$this, 'error_handler'));
+		set_error_handler(array(&$this, 'error_handler'), ($this->error_types !== null) ? $this->error_types : error_reporting());
 	}
 
 	function uninstall()
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php
index 2af8b50b54..0c5205530b 100644
--- a/phpBB/phpbb/log/log.php
+++ b/phpBB/phpbb/log/log.php
@@ -708,6 +708,50 @@ class log implements \phpbb\log\log_interface
 			}
 		}
 
+		/**
+		* Allow modifying or execute extra final filter on log entries
+		*
+		* @event core.get_logs_after
+		* @var	array	log			Array with all our log entries
+		* @var	array	topic_id_list		Array of topic ids, for which we
+		*									get the permission data
+		* @var	array	reportee_id_list	Array of additional user IDs we
+		*									get the username strings for
+		* @var	string	mode		Mode of the entries we display
+		* @var	bool	count_logs	Do we count all matching entries?
+		* @var	int		limit		Limit the number of entries
+		* @var	int		offset		Offset when fetching the entries
+		* @var	mixed	forum_id	Limit entries to the forum_id,
+		*							can also be an array of forum_ids
+		* @var	int		topic_id	Limit entries to the topic_id
+		* @var	int		user_id		Limit entries to the user_id
+		* @var	int		log_time	Limit maximum age of log entries
+		* @var	string	sort_by		SQL order option
+		* @var	string	keywords	Will only return entries that have the
+		*							keywords in log_operation or log_data
+		* @var	string	profile_url	URL to the users profile
+		* @var	int		log_type	The type of logs it was filtered
+		* @since 3.1.3-RC1
+		*/
+		$vars = array(
+			'log',
+			'topic_id_list',
+			'reportee_id_list',
+			'mode',
+			'count_logs',
+			'limit',
+			'offset',
+			'forum_id',
+			'topic_id',
+			'user_id',
+			'log_time',
+			'sort_by',
+			'keywords',
+			'profile_url',
+			'log_type',
+		);
+		extract($this->dispatcher->trigger_event('core.get_logs_after', compact($vars)));
+
 		return $log;
 	}
 
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 691d0d5bef..0a6a18ffbe 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1082,7 +1082,7 @@ class session
 	*/
 	function check_ban($user_id = false, $user_ips = false, $user_email = false, $return = false)
 	{
-		global $config, $db;
+		global $config, $db, $phpbb_dispatcher;
 
 		if (defined('IN_CHECK_BAN') || defined('SKIP_CHECK_BAN'))
 		{
@@ -1196,6 +1196,20 @@ class session
 		}
 		$db->sql_freeresult($result);
 
+		/**
+		* Event to set custom ban type
+		*
+		* @event core.session_set_custom_ban
+		* @var	bool		return				If $return is false this routine does not return on finding a banned user, it outputs a relevant message and stops execution
+		* @var	bool		banned				Check if user already banned
+		* @var	array|false	ban_row				Ban data
+		* @var	string		ban_triggered_by	Method that caused ban, can be your custom method
+		* @since 3.1.3-RC1
+		*/
+		$ban_row = isset($ban_row) ? $ban_row : false;
+		$vars = array('return', 'banned', 'ban_row', 'ban_triggered_by');
+		extract($phpbb_dispatcher->trigger_event('core.session_set_custom_ban', compact($vars)));
+
 		if ($banned && !$return)
 		{
 			global $template, $phpbb_root_path, $phpEx;
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 48bcc2e922..7850412cf3 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -137,7 +137,9 @@
 					<!-- ENDIF -->
 					<!-- EVENT viewtopic_body_avatar_after -->
 				</div>
+				<!-- EVENT viewtopic_body_post_author_before -->
 				<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF -->
+				<!-- EVENT viewtopic_body_post_author_after -->
 			</dt>
 
 			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd class="profile-rank">{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index 24a8c12be0..780ece82a2 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -163,7 +163,9 @@
 					<a id="unread" class="anchor"<!-- IF S_UNREAD_VIEW --> data-url="{postrow.U_MINI_POST}"<!-- ENDIF -->></a>
 				<!-- ENDIF -->
 				<a name="p{postrow.POST_ID}" class="anchor"></a>
+				<!-- EVENT viewtopic_body_post_author_before -->
 				<b class="postauthor"<!-- IF postrow.POST_AUTHOR_COLOUR --> style="color: {postrow.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{postrow.POST_AUTHOR}</b>
+				<!-- EVENT viewtopic_body_post_author_after -->
 			</td>
 			<td width="100%" height="25">
 				<table width="100%" cellspacing="0">
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 182bc2e285..8c74ca1f3c 100644
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -164,6 +164,22 @@ switch ($mode)
 
 				$cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name);
 
+				/**
+				* Event to save custom cookies from deletion
+				*
+				* @event core.ucp_delete_cookies
+				* @var	string	cookie_name		Cookie name to checking
+				* @var	bool	retain_cookie	Do we retain our cookie or not, true if retain
+				* @since 3.1.3-RC1
+				*/
+				$retain_cookie = false;
+				$vars = array('cookie_name', 'retain_cookie');
+				extract($phpbb_dispatcher->trigger_event('core.ucp_delete_cookies', compact($vars)));
+				if ($retain_cookie)
+				{
+					continue;
+				}
+
 				// Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_
 				if (strpos($cookie_name, 'poll_') !== 0)
 				{
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 8d2011c5c1..92ac9171cb 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -887,6 +887,28 @@ if (sizeof($topic_list))
 
 		$s_type_switch = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0;
 
+		/**
+		* Event after the topic data has been assigned to the template
+		*
+		* @event core.viewforum_topic_row_after
+		* @var	array	row				Array with the topic data
+		* @var	array	rowset			Array with topics data (in topic_id => topic_data format)
+		* @var	bool	s_type_switch	Flag indicating if the topic type is [global] announcement
+		* @var	int		topic_id		The topic ID
+		* @var	array	topic_list		Array with current viewforum page topic ids
+		* @var	array	topic_row		Template array with topic data
+		* @since 3.1.3-RC1
+		*/
+		$vars = array(
+			'row',
+			'rowset',
+			's_type_switch',
+			'topic_id',
+			'topic_list',
+			'topic_row',
+		);
+		extract($phpbb_dispatcher->trigger_event('core.viewforum_topic_row_after', compact($vars)));
+
 		if ($unread_topic)
 		{
 			$mark_forum_read = false;
diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php
index 1d8ef367f5..b92c4fa6bb 100644
--- a/tests/error_collector_test.php
+++ b/tests/error_collector_test.php
@@ -17,7 +17,7 @@ class phpbb_error_collector_test extends phpbb_test_case
 {
 	public function test_collection()
 	{
-		$collector = new \phpbb\error_collector;
+		$collector = new \phpbb\error_collector(E_ALL | E_STRICT); // php set_error_handler() default
 		$collector->install();
 
 		// Cause a warning
@@ -35,4 +35,32 @@ class phpbb_error_collector_test extends phpbb_test_case
 		$this->assertStringStartsWith('Errno 2: Division by zero at ', $error_contents);
 		$this->assertStringEndsWith(" line $line", $error_contents);
 	}
+
+	public function test_collection_with_mask()
+	{
+		$collector = new \phpbb\error_collector(E_ALL & ~E_NOTICE); // not collecting notices
+		$collector->install();
+
+		// Cause a warning
+		1/0; $line = __LINE__;
+
+		// Cause a notice
+		$array = array('ITEM' => 'value');
+		$value = $array[ITEM]; $line2 = __LINE__;
+
+		$collector->uninstall();
+
+		// The notice should not be collected
+		$this->assertEmpty($collector->errors[1]);
+
+		list($errno, $msg_text, $errfile, $errline) = $collector->errors[0];
+		$error_contents = $collector->format_errors();
+
+		$this->assertEquals($errno, 2);
+
+		// Unfortunately $error_contents will contain the full path here,
+		// because the tests directory is outside of phpbb root path.
+		$this->assertStringStartsWith('Errno 2: Division by zero at ', $error_contents);
+		$this->assertStringEndsWith(" line $line", $error_contents);
+	}
 }