From 4127acb19bf1152fe49ddd74da18dd222489d719 Mon Sep 17 00:00:00 2001 From: brunoais Date: Thu, 3 Jul 2014 14:28:56 +0100 Subject: [PATCH 1/4] [ticket/12800] core.functions_display.display_user_activity.actives_after Adding core.functions_display.display_user_activity.actives_after PHPBB3-12800 --- phpBB/includes/functions_display.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 68b1356297..17bcaa5dc5 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1133,6 +1133,18 @@ function display_user_activity(&$userdata) $db->sql_freeresult($result); } } + + /** + * Alter list of forums and topics to display as active + * + * @event core.functions_display.display_user_activity.actives_after + * @var array userdata User's data + * @var array active_f_row List of active forums + * @var array active_t_row List of active posts + * @since 3.1.0-RC2 + */ + $vars = array('userdata', 'active_f_row', 'active_t_row'); + extract($phpbb_dispatcher->trigger_event('core.functions_display.display_user_activity.actives_after', compact($vars))); $userdata['active_t_row'] = $active_t_row; $userdata['active_f_row'] = $active_f_row; From 49a1d845fe4ccb8ce56c5aa9c3a84bc14f87778f Mon Sep 17 00:00:00 2001 From: brunoais Date: Sun, 20 Jul 2014 09:24:26 +0100 Subject: [PATCH 2/4] [ticket/12800] Missing $phpbb_dispatcher as a global PHPBB3-12800 --- phpBB/includes/functions_display.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 17bcaa5dc5..2615ff5a3d 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1063,7 +1063,8 @@ function display_reasons($reason_id = 0) function display_user_activity(&$userdata) { global $auth, $template, $db, $user; - global $phpbb_root_path, $phpEx, $phpbb_container; + global $phpbb_root_path, $phpEx; + global $phpbb_container, $phpbb_dispatcher; // Do not display user activity for users having more than 5000 posts... if ($userdata['user_posts'] > 5000) From 51feab9ed6b6ba7c4d03ed6f1f6e8feef4fe661f Mon Sep 17 00:00:00 2001 From: brunoais Date: Sun, 20 Jul 2014 10:05:50 +0100 Subject: [PATCH 3/4] [ticket/12800] removed superfulous tab character PHPBB3-12800 --- phpBB/includes/functions_display.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 2615ff5a3d..7502725b95 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1134,7 +1134,7 @@ function display_user_activity(&$userdata) $db->sql_freeresult($result); } } - + /** * Alter list of forums and topics to display as active * From 25826fa5877df7473b6e535e1d16009a1e119d96 Mon Sep 17 00:00:00 2001 From: brunoais Date: Fri, 1 Aug 2014 11:09:26 +0100 Subject: [PATCH 4/4] [ticket/12880] Changed name change @since as requested Changed name to core.display_user_activity_modify_actives as requested Changed @since to 3.1.0-RC3 because RC2 is already out. PHPBB3-12880 --- phpBB/includes/functions_display.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 7502725b95..bfe9c0b055 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1138,14 +1138,14 @@ function display_user_activity(&$userdata) /** * Alter list of forums and topics to display as active * - * @event core.functions_display.display_user_activity.actives_after + * @event core.display_user_activity_modify_actives * @var array userdata User's data * @var array active_f_row List of active forums * @var array active_t_row List of active posts - * @since 3.1.0-RC2 + * @since 3.1.0-RC3 */ $vars = array('userdata', 'active_f_row', 'active_t_row'); - extract($phpbb_dispatcher->trigger_event('core.functions_display.display_user_activity.actives_after', compact($vars))); + extract($phpbb_dispatcher->trigger_event('core.display_user_activity_modify_actives', compact($vars))); $userdata['active_t_row'] = $active_t_row; $userdata['active_f_row'] = $active_f_row;