From ddff81c21f0f5ceb45f1925ac69775dac2ad4ba6 Mon Sep 17 00:00:00 2001 From: Kevin Roy Date: Fri, 3 Apr 2015 09:35:44 -0300 Subject: [PATCH] [ticket/13742] Use correct avatar path for local avatar Prior to this change, the path might have been incorrect when using PHPBB_USE_BOARD_URL_PATH. PHPBB3-13742 --- phpBB/phpbb/avatar/driver/local.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php index 8888686b2d..36087f8ba0 100644 --- a/phpBB/phpbb/avatar/driver/local.php +++ b/phpBB/phpbb/avatar/driver/local.php @@ -23,8 +23,10 @@ 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(); + return array( - 'src' => $this->path_helper->get_web_root_path() . $this->config['avatar_gallery_path'] . '/' . $row['avatar'], + 'src' => $root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'], 'width' => $row['avatar_width'], 'height' => $row['avatar_height'], );