mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Marc Alexander
2015-09-08 13:35:04 +02:00
parent 3ddee852fa 90d5eefccf
commit 9d18b3d1ee
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/avatar/driver/upload.php
View File

@@ -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();