mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-18 17:28:56 +00:00
Merge branch 'develop-ascraeus' into develop
This commit is contained in:
commit
fab25164a0
1 changed files with 14 additions and 1 deletions
|
@ -1063,7 +1063,8 @@ function display_reasons($reason_id = 0)
|
||||||
function display_user_activity(&$userdata)
|
function display_user_activity(&$userdata)
|
||||||
{
|
{
|
||||||
global $auth, $template, $db, $user;
|
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...
|
// Do not display user activity for users having more than 5000 posts...
|
||||||
if ($userdata['user_posts'] > 5000)
|
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_t_row'] = $active_t_row;
|
||||||
$userdata['active_f_row'] = $active_f_row;
|
$userdata['active_f_row'] = $active_f_row;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue