mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/13276' into ticket/13276-master

Browse Source
This commit is contained in:
Marc Alexander
2023-06-30 16:45:37 +02:00
parent 6d1284495b a686a2f057
commit 6049fb8fdf
9 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/avatar/driver/local.php
View File

@@ -23,7 +23,7 @@ class local extends \phpbb\avatar\driver\driver
*/
public function get_data($row)
{
$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $this->path_helper->get_web_root_path();
$root_path = $this->path_helper->get_web_root_path();
return array(
'src' => $root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],

3
phpBB/phpbb/avatar/driver/upload.php
View File

@@ -100,8 +100,7 @@ class upload extends \phpbb\avatar\driver\driver
return false;
}
$use_board = defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH;
$web_path = $use_board ? generate_board_url() . '/' : $this->path_helper->get_web_root_path();
$web_path = $this->path_helper->get_web_root_path();
$template->assign_vars([
'AVATAR_ALLOWED_EXTENSIONS' => implode(',', preg_replace('/^/', '.', $this->allowed_extensions)),