aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-08-01 23:28:30 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-08-01 23:28:30 +0200
commitfab25164a085055182d4bd68efee3f368eff4df1 (patch)
tree28f2a319fe025b6ee0c860739009685b94d87923
parent76dbe95afcc06193929d8a13b74672b9c0b5fad0 (diff)
parent5b2e9629344e973655c9cb009f6714214822a360 (diff)
downloadforums-fab25164a085055182d4bd68efee3f368eff4df1.tar
forums-fab25164a085055182d4bd68efee3f368eff4df1.tar.gz
forums-fab25164a085055182d4bd68efee3f368eff4df1.tar.bz2
forums-fab25164a085055182d4bd68efee3f368eff4df1.tar.xz
forums-fab25164a085055182d4bd68efee3f368eff4df1.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/includes/functions_display.php15
1 files changed, 14 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 68b1356297..bfe9c0b055 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)
@@ -1134,6 +1135,18 @@ function display_user_activity(&$userdata)
}
}
+ /**
+ * Alter list of forums and topics to display as active
+ *
+ * @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-RC3
+ */
+ $vars = array('userdata', 'active_f_row', 'active_t_row');
+ 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;