Merge branch '3.1.x'

1 files changed, 14 insertions, 0 deletions

diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index b18b4d7b29..3e9eb019bc 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -394,15 +394,29 @@ $sql_array = array(
 /**
 * Event to modify the SQL query before the topic data is retrieved
 *
+* It may also be used to override the above assigned template vars
+*
 * @event core.viewforum_get_topic_data
 * @var	array	forum_data			Array with forum data
 * @var	array	sql_array			The SQL array to get the data of all topics
+* @var	array	forum_id			The forum_id whose topics are being listed
+* @var	array	topics_count		The total number of topics for display
+* @var	array	sort_days			The oldest topic displayable in elapsed days
+* @var	array	sort_key			The sorting by. It is one of the first character of (in low case):
+*									Author, Post time, Replies, Subject, Views
+* @var	array	sort_dir			Either "a" for ascending or "d" for descending
 * @since 3.1.0-a1
 * @change 3.1.0-RC4 Added forum_data var
+* @change 3.1.4-RC1 Added forum_id, topics_count, sort_days, sort_key and sort_dir vars
 */
 $vars = array(
 	'forum_data',
 	'sql_array',
+	'forum_id',
+	'topics_count',
+	'sort_days',
+	'sort_key',
+	'sort_dir',
 );
 extract($phpbb_dispatcher->trigger_event('core.viewforum_get_topic_data', compact($vars)));