aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_board.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-04-17 08:54:51 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-04-17 08:54:51 +0200
commitdc5a167c429a3813d66b0ae3d14242650466cac6 (patch)
tree9a23a88f7bc2d482cef19f42f437bf77be31f41f /phpBB/includes/acp/acp_board.php
parent507efee633fee769e7e2af4a2b298c951193f800 (diff)
downloadforums-dc5a167c429a3813d66b0ae3d14242650466cac6.tar
forums-dc5a167c429a3813d66b0ae3d14242650466cac6.tar.gz
forums-dc5a167c429a3813d66b0ae3d14242650466cac6.tar.bz2
forums-dc5a167c429a3813d66b0ae3d14242650466cac6.tar.xz
forums-dc5a167c429a3813d66b0ae3d14242650466cac6.zip
[ticket/security/231] Disable remote avatar functionality & add warning
SECURITY-231
Diffstat (limited to 'phpBB/includes/acp/acp_board.php')
-rw-r--r--phpBB/includes/acp/acp_board.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index f89f5535eb..5d3df2629a 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -122,6 +122,7 @@ class acp_board
$avatar_vars = array();
foreach ($avatar_drivers as $current_driver)
{
+ /** @var \phpbb\avatar\driver\driver_interface $driver */
$driver = $phpbb_avatar_manager->get_driver($current_driver, false);
/*
@@ -730,7 +731,7 @@ class acp_board
$template->assign_block_vars('options', array(
'KEY' => $config_key,
'TITLE' => (isset($user->lang[$vars['lang']])) ? $user->lang[$vars['lang']] : $vars['lang'],
- 'S_EXPLAIN' => $vars['explain'],
+ 'S_EXPLAIN' => $vars['explain'] && !empty($l_explain),
'TITLE_EXPLAIN' => $l_explain,
'CONTENT' => $content,
)