diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-04-04 11:02:06 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-04-04 11:02:06 +0200 |
| commit | 2ebab2ed5f5a0a0588197849c894941ec35db329 (patch) | |
| tree | 05e1aaf7132247eb148100332b0939916eba5516 | |
| parent | 7541fab408a3200dd8514acde93889faf0193d83 (diff) | |
| parent | 55907c17247fe4108689429be8ad3358120fe074 (diff) | |
| download | forums-2ebab2ed5f5a0a0588197849c894941ec35db329.tar forums-2ebab2ed5f5a0a0588197849c894941ec35db329.tar.gz forums-2ebab2ed5f5a0a0588197849c894941ec35db329.tar.bz2 forums-2ebab2ed5f5a0a0588197849c894941ec35db329.tar.xz forums-2ebab2ed5f5a0a0588197849c894941ec35db329.zip | |
Merge branch '3.1.x'
| -rw-r--r-- | phpBB/phpbb/avatar/driver/local.php | 4 |
1 files changed, 3 insertions, 1 deletions
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'], ); |