diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-04-27 13:23:07 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-04-27 13:23:07 +0200 |
| commit | db43961de63d169b6a3dbe6a75f421cd94f1e5fa (patch) | |
| tree | 990c11bc7e9a682b3ae1207f98e2cf2773071631 /phpBB/includes/acp/acp_board.php | |
| parent | 308dd49bb95b84345efb23e91ea03f9a91c5a2d4 (diff) | |
| parent | dc5a167c429a3813d66b0ae3d14242650466cac6 (diff) | |
| download | forums-db43961de63d169b6a3dbe6a75f421cd94f1e5fa.tar forums-db43961de63d169b6a3dbe6a75f421cd94f1e5fa.tar.gz forums-db43961de63d169b6a3dbe6a75f421cd94f1e5fa.tar.bz2 forums-db43961de63d169b6a3dbe6a75f421cd94f1e5fa.tar.xz forums-db43961de63d169b6a3dbe6a75f421cd94f1e5fa.zip | |
Merge pull request #46 from phpbb/ticket/security/231
[ticket/security/231] Disable remote avatar functionality & add warning
Diffstat (limited to 'phpBB/includes/acp/acp_board.php')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 5b37bb5c57..e348c769bd 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -125,6 +125,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); /* @@ -733,7 +734,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, ) |