makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2018-11-28 23:21:50 +01:00
commit 685397c32e
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/functions_display.php
View file

@ -1229,6 +1229,7 @@ function display_user_activity(&$userdata_ary)
} }
$userdata = $userdata_ary; $userdata = $userdata_ary;
$show_user_activity = true;
/** /**
* Alter list of forums and topics to display as active * Alter list of forums and topics to display as active
* *
@ -1236,9 +1237,11 @@ function display_user_activity(&$userdata_ary)
* @var array userdata User's data * @var array userdata User's data
* @var array active_f_row List of active forums * @var array active_f_row List of active forums
* @var array active_t_row List of active posts * @var array active_t_row List of active posts
* @var bool show_user_activity Show user forum and topic activity
* @since 3.1.0-RC3 * @since 3.1.0-RC3
* @changed 3.2.5-RC1 Added show_user_activity into event
*/ */
$vars = array('userdata', 'active_f_row', 'active_t_row'); $vars = array('userdata', 'active_f_row', 'active_t_row', 'show_user_activity');
extract($phpbb_dispatcher->trigger_event('core.display_user_activity_modify_actives', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.display_user_activity_modify_actives', compact($vars)));
$userdata_ary = $userdata; $userdata_ary = $userdata;
unset($userdata); unset($userdata);
@ -1275,7 +1278,7 @@ function display_user_activity(&$userdata_ary)
'ACTIVE_TOPIC_PCT' => sprintf($l_active_pct, $active_t_pct), 'ACTIVE_TOPIC_PCT' => sprintf($l_active_pct, $active_t_pct),
'U_ACTIVE_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $active_f_id), 'U_ACTIVE_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $active_f_id),
'U_ACTIVE_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $active_t_id), 'U_ACTIVE_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $active_t_id),
'S_SHOW_ACTIVITY' => true) 'S_SHOW_ACTIVITY' => $show_user_activity)
); );
} }