makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source
This commit is contained in:
Marc Alexander 2015-09-08 13:35:04 +02:00
commit 9d18b3d1ee
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions.php
View file

@ -4031,7 +4031,7 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false)
return $html; return $html;
} }
$avatar_data = $driver->get_data($row, $ignore_config); $avatar_data = $driver->get_data($row);
} }
else else
{ {

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

@ -60,7 +60,7 @@ class upload extends \phpbb\avatar\driver\driver
/** /**
* {@inheritdoc} * {@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(); $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $this->path_helper->get_web_root_path();