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.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2023-08-06 14:56:53 +02:00
parent cdc7f6da22 e5db724d2c
commit abc4867dbd
6 changed files with 14 additions and 16 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'],

5
phpBB/phpbb/path_helper.php
View File

@@ -153,6 +153,11 @@ class path_helper
return $this->web_root_path;
}
if (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH)
{
return $this->web_root_path = generate_board_url() . '/';
}
// We do not need to escape $path_info, $request_uri and $script_name because we can not find their content in the result.
// Path info (e.g. /foo/bar)
$path_info = filesystem_helper::clean_path($this->symfony_request->getPathInfo());

2
phpBB/phpbb/textformatter/s9e/renderer.php
View File

@@ -155,7 +155,7 @@ class renderer implements \phpbb\textformatter\renderer_interface
/**
* @see smiley_text()
*/
$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $path_helper->get_web_root_path();
$root_path = $path_helper->get_web_root_path();
$this->set_smilies_path($root_path . $config['smilies_path']);
}