diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-21 11:04:23 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-21 11:04:23 +0200 |
| commit | ba5b53521a186dc23d6d4b849c7f76196c783d43 (patch) | |
| tree | 0881bc85252172f371c3d1112f4a3e53ca781551 /phpBB/phpbb/avatar/driver/upload.php | |
| parent | 4649155f415310a67be409ff15a3140accbae799 (diff) | |
| parent | a80d5c93e354aa1e4dff548a89129ccd7f5488ee (diff) | |
| download | forums-ba5b53521a186dc23d6d4b849c7f76196c783d43.tar forums-ba5b53521a186dc23d6d4b849c7f76196c783d43.tar.gz forums-ba5b53521a186dc23d6d4b849c7f76196c783d43.tar.bz2 forums-ba5b53521a186dc23d6d4b849c7f76196c783d43.tar.xz forums-ba5b53521a186dc23d6d4b849c7f76196c783d43.zip | |
Merge remote-tracking branch 'marc1706/ticket/11930' into develop
* marc1706/ticket/11930:
[ticket/11930] Update docblock of avatar driver constructor
[ticket/11930] Modify order of properties to fit constructor method
[ticket/11930] Move path_helper in front of optional cache argument
[ticket/11930] Fix tests after adding phpbb\path_helper to avatar drivers
[ticket/11930] Use \phpbb\path_helper for avatar URLs
Diffstat (limited to 'phpBB/phpbb/avatar/driver/upload.php')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index 377c9a0b04..bda872df7a 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -29,7 +29,7 @@ class upload extends \phpbb\avatar\driver\driver public function get_data($row, $ignore_config = false) { return array( - 'src' => $this->phpbb_root_path . 'download/file.' . $this->php_ext . '?avatar=' . $row['avatar'], + 'src' => $this->path_helper->get_web_root_path() . 'download/file.' . $this->php_ext . '?avatar=' . $row['avatar'], 'width' => $row['avatar_width'], 'height' => $row['avatar_height'], ); |