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

[feature/avatars] Let avatar manager handle $ignore_config

Browse Source 
The avatar manager already handles if avatars are enabled. It should also
handle ignoring the config settings.

PHPBB3-10018
This commit is contained in:
Marc Alexander
2012-11-30 15:12:34 +01:00
parent 562ebe5c12
commit d5cbedaaa2
8 changed files with 35 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
phpBB/includes/avatar/driver/local.php
View File

@@ -24,24 +24,13 @@ class phpbb_avatar_driver_local 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_local'])
{
return array(
'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
'width' => $row['avatar_width'],
'height' => $row['avatar_height'],
);
}
else
{
return array(
'src' => '',
'width' => 0,
'height' => 0,
);
}
return array(
'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
'width' => $row['avatar_width'],
'height' => $row['avatar_height'],
);
}
/**