1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 03:34:04 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander
2017-06-24 21:42:54 +02:00
5 changed files with 44 additions and 3 deletions

View File

@@ -1153,12 +1153,13 @@ function display_custom_bbcodes()
*/
function display_user_activity(&$userdata_ary)
{
global $auth, $template, $db, $user;
global $auth, $template, $db, $user, $config;
global $phpbb_root_path, $phpEx;
global $phpbb_container, $phpbb_dispatcher;
// Do not display user activity for users having more than 5000 posts...
if ($userdata_ary['user_posts'] > 5000)
// Do not display user activity for users having too many posts...
$limit = $config['load_user_activity_limit'];
if ($userdata_ary['user_posts'] > $limit && $limit != 0)
{
return;
}