diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-09-08 13:34:58 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-09-08 13:34:58 +0200 |
| commit | 90d5eefccffce86e1c8ae857080a0ed25f7a79db (patch) | |
| tree | 30ee6a3be4e921f7911169c811282dffd6748a5d | |
| parent | 9537ec56eb4c37cd4aec905c0db35d4b46e73ac6 (diff) | |
| parent | 076807c63ab36684dc1dc6039092066a17d5c9b6 (diff) | |
| download | forums-90d5eefccffce86e1c8ae857080a0ed25f7a79db.tar forums-90d5eefccffce86e1c8ae857080a0ed25f7a79db.tar.gz forums-90d5eefccffce86e1c8ae857080a0ed25f7a79db.tar.bz2 forums-90d5eefccffce86e1c8ae857080a0ed25f7a79db.tar.xz forums-90d5eefccffce86e1c8ae857080a0ed25f7a79db.zip | |
Merge pull request #3881 from VSEphpbb/ticket/14142
[ticket/14142] Remove unused ignore_configs from avatar drivers
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ac25f24ddd..80d6e22bb7 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4848,7 +4848,7 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false) return $html; } - $avatar_data = $driver->get_data($row, $ignore_config); + $avatar_data = $driver->get_data($row); } else { diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index a1d84345e1..e44157294c 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -53,7 +53,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(); |