aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-06-24 21:42:39 +0200
committerMarc Alexander <admin@m-a-styles.de>2017-06-24 21:42:39 +0200
commitb59073cf3ed54d040aef0f02cb3e5c28fb768b5b (patch)
tree0c6bfaf0696ed1498b3e68d43721a530a90312db /phpBB/includes/functions_display.php
parent909976f0761622fd0b6ecd00bef4919513c738df (diff)
parentaa37e9b7fc60bd443c6abbcdc3adbf28ae010f32 (diff)
downloadforums-b59073cf3ed54d040aef0f02cb3e5c28fb768b5b.tar
forums-b59073cf3ed54d040aef0f02cb3e5c28fb768b5b.tar.gz
forums-b59073cf3ed54d040aef0f02cb3e5c28fb768b5b.tar.bz2
forums-b59073cf3ed54d040aef0f02cb3e5c28fb768b5b.tar.xz
forums-b59073cf3ed54d040aef0f02cb3e5c28fb768b5b.zip
Merge pull request #4794 from lr94/ticket/15176
[ticket/15176] Add setting for user activity display limit.
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index c8b5ec8b1a..32bee14eef 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1165,12 +1165,13 @@ function display_reasons($reason_id = 0)
*/
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;
}