diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-30 15:12:34 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-30 15:12:34 +0100 |
| commit | d5cbedaaa28312c107ec562c78ffaa034595f336 (patch) | |
| tree | d3befad8b3640244e10d6d97d58fc3a1a0d54ce0 /phpBB/includes/avatar/driver/remote.php | |
| parent | 562ebe5c12b8a238b94a63ba53b694af4d061bc9 (diff) | |
| download | forums-d5cbedaaa28312c107ec562c78ffaa034595f336.tar forums-d5cbedaaa28312c107ec562c78ffaa034595f336.tar.gz forums-d5cbedaaa28312c107ec562c78ffaa034595f336.tar.bz2 forums-d5cbedaaa28312c107ec562c78ffaa034595f336.tar.xz forums-d5cbedaaa28312c107ec562c78ffaa034595f336.zip | |
[feature/avatars] Let avatar manager handle $ignore_config
The avatar manager already handles if avatars are enabled. It should also
handle ignoring the config settings.
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar/driver/remote.php')
| -rw-r--r-- | phpBB/includes/avatar/driver/remote.php | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php index 1da5fc16e8..344275a251 100644 --- a/phpBB/includes/avatar/driver/remote.php +++ b/phpBB/includes/avatar/driver/remote.php @@ -24,24 +24,13 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver /** * @inheritdoc */ - public function get_data($row, $ignore_config = false) + public function get_data($row) { - if ($ignore_config || $this->config['allow_avatar_remote']) - { - return array( - 'src' => $row['avatar'], - 'width' => $row['avatar_width'], - 'height' => $row['avatar_height'], - ); - } - else - { - return array( - 'src' => '', - 'width' => 0, - 'height' => 0, - ); - } + return array( + 'src' => $row['avatar'], + 'width' => $row['avatar_width'], + 'height' => $row['avatar_height'], + ); } /** |