mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-16 05:34:01 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2017-06-24 21:42:54 +02:00
parent d77c018d7f b59073cf3e
commit 976d799ff2
5 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/includes/acp/acp_board.php
View File

@@ -353,6 +353,7 @@ class acp_board
'load_moderators' => array('lang' => 'YES_MODERATORS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
'load_jumpbox' => array('lang' => 'YES_JUMPBOX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
'load_user_activity' => array('lang' => 'LOAD_USER_ACTIVITY', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'load_user_activity_limit' => array('lang' => 'LOAD_USER_ACTIVITY_LIMIT', 'validate' => 'int:0:99999999', 'type' => 'number:0:99999999', 'explain' => true),
'load_tplcompile' => array('lang' => 'RECOMPILE_STYLES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'allow_cdn' => array('lang' => 'ALLOW_CDN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'allow_live_searches' => array('lang' => 'ALLOW_LIVE_SEARCHES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),

7
phpBB/includes/functions_display.php
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;
}