diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-30 23:11:44 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-30 23:11:44 +0100 |
| commit | 081440f6c4bd6b7c2838dd0587ed6a4dffc87d52 (patch) | |
| tree | 72c9d739430466e5ac1e81db930a89d503ff5772 /phpBB/includes/avatar/driver/upload.php | |
| parent | 33b98dc5ba0b690fdae72acfd676dae5a897cb6a (diff) | |
| download | forums-081440f6c4bd6b7c2838dd0587ed6a4dffc87d52.tar forums-081440f6c4bd6b7c2838dd0587ed6a4dffc87d52.tar.gz forums-081440f6c4bd6b7c2838dd0587ed6a4dffc87d52.tar.bz2 forums-081440f6c4bd6b7c2838dd0587ed6a4dffc87d52.tar.xz forums-081440f6c4bd6b7c2838dd0587ed6a4dffc87d52.zip | |
[feature/avatars] Create setting for enabling avatar in manager
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar/driver/upload.php')
| -rw-r--r-- | phpBB/includes/avatar/driver/upload.php | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php index 497dd8ad19..38627baacf 100644 --- a/phpBB/includes/avatar/driver/upload.php +++ b/phpBB/includes/avatar/driver/upload.php @@ -26,22 +26,11 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver */ public function get_data($row, $ignore_config = false) { - if ($ignore_config || $this->config['allow_avatar_upload']) - { - return array( - 'src' => $this->phpbb_root_path . 'download/file' . $this->php_ext . '?avatar=' . $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 . 'download/file' . $this->php_ext . '?avatar=' . $row['avatar'], + 'width' => $row['avatar_width'], + 'height' => $row['avatar_height'], + ); } /** @@ -133,7 +122,6 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver global $user; return array( - 'allow_avatar_upload' => array('lang' => 'ALLOW_UPLOAD', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'allow_avatar_remote_upload'=> array('lang' => 'ALLOW_REMOTE_UPLOAD', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'avatar_filesize' => array('lang' => 'MAX_FILESIZE', 'validate' => 'int:0', 'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']), 'avatar_path' => array('lang' => 'AVATAR_STORAGE_PATH', 'validate' => 'rwpath', 'type' => 'text:20:255', 'explain' => true), |