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] Various cosmetic changes

Browse Source 
Various small changes based on feedback from nn-
* Renaming $php_ext to $phpEx
* Fixing copyright years
* Explain $ignore_config
* Explain Regex
* Copypasta package error
* rename get_singleton

PHPBB3-10018
This commit is contained in:
Cullen Walsh
2011-04-18 10:44:29 -07:00
committed by Cullen Walsh
parent 7abded081d
commit f102d9a631
7 changed files with 80 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/includes/avatar/driver/upload.php
View File

@@ -2,7 +2,7 @@
/**
*
* @package avatar
* @copyright (c) 2005, 2009 phpBB Group
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
@@ -22,18 +22,14 @@ if (!defined('IN_PHPBB'))
class phpbb_avatar_driver_upload extends phpbb_avatar_driver
{
/**
* Get the avatar url and dimensions
*
* @param $ignore_config Whether $user or global avatar visibility settings
* should be ignored
* @return array Avatar data
* @inheritdoc
*/
public function get_data($user_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=' . $user_row['user_avatar'],
'src' => $this->phpbb_root_path . 'download/file.' . $this->phpEx . '?avatar=' . $user_row['user_avatar'],
'width' => $user_row['user_avatar_width'],
'height' => $user_row['user_avatar_height'],
);
@@ -49,8 +45,8 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
}
/**
* @TODO
**/
* @inheritdoc
*/
public function handle_form($template, &$error = array(), $submitted = false)
{
if ($submitted) {