diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-04-04 11:04:31 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-04-04 11:04:31 +0200 |
| commit | c900dcdc2aadded93ae15d2def82a3738e24d342 (patch) | |
| tree | 004847169bd50458e34b5c323c91c4a815d17bff /phpBB | |
| parent | 2ebab2ed5f5a0a0588197849c894941ec35db329 (diff) | |
| parent | 558d604d83fd5ded2edc854a9944ad0d1188e2e5 (diff) | |
| download | forums-c900dcdc2aadded93ae15d2def82a3738e24d342.tar forums-c900dcdc2aadded93ae15d2def82a3738e24d342.tar.gz forums-c900dcdc2aadded93ae15d2def82a3738e24d342.tar.bz2 forums-c900dcdc2aadded93ae15d2def82a3738e24d342.tar.xz forums-c900dcdc2aadded93ae15d2def82a3738e24d342.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index 003b23659f..ee36243844 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -48,8 +48,10 @@ class upload extends \phpbb\avatar\driver\driver */ public function get_data($row, $ignore_config = false) { + $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() . 'download/file.' . $this->php_ext . '?avatar=' . $row['avatar'], + 'src' => $root_path . 'download/file.' . $this->php_ext . '?avatar=' . $row['avatar'], 'width' => $row['avatar_width'], 'height' => $row['avatar_height'], ); |