diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-09-08 13:35:04 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-09-08 13:35:04 +0200 |
| commit | 9d18b3d1eeb1cb755fb7949bad07a7586eef4962 (patch) | |
| tree | f038d1ba303bdbc9e2f0efa488e6400c0b2bf7ac /phpBB/phpbb/avatar | |
| parent | 3ddee852fa0c1dd1518681679f52a4f9b427a9da (diff) | |
| parent | 90d5eefccffce86e1c8ae857080a0ed25f7a79db (diff) | |
| download | forums-9d18b3d1eeb1cb755fb7949bad07a7586eef4962.tar forums-9d18b3d1eeb1cb755fb7949bad07a7586eef4962.tar.gz forums-9d18b3d1eeb1cb755fb7949bad07a7586eef4962.tar.bz2 forums-9d18b3d1eeb1cb755fb7949bad07a7586eef4962.tar.xz forums-9d18b3d1eeb1cb755fb7949bad07a7586eef4962.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/phpbb/avatar')
| -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 1939a91cfe..b31609b982 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -60,7 +60,7 @@ class upload extends \phpbb\avatar\driver\driver /** * {@inheritdoc} */ - public function get_data($row, $ignore_config = false) + 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(); |