Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-12-28 22:15:29 +01:00
commit f3750fbfea
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -786,9 +786,11 @@ $topic_tracking_info = $tracking_topics = array();
* @var array topic_list Array with current viewforum page topic ids * @var array topic_list Array with current viewforum page topic ids
* @var array rowset Array with topics data (in topic_id => topic_data format) * @var array rowset Array with topics data (in topic_id => topic_data format)
* @var int total_topic_count Forum's total topic count * @var int total_topic_count Forum's total topic count
* @var int forum_id Forum identifier
* @since 3.1.0-b3 * @since 3.1.0-b3
* @changed 3.1.11-RC1 Added forum_id
*/ */
$vars = array('topic_list', 'rowset', 'total_topic_count'); $vars = array('topic_list', 'rowset', 'total_topic_count', 'forum_id');
extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_topics_data', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_topics_data', compact($vars)));
// Okay, lets dump out the page ... // Okay, lets dump out the page ...