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

[feature/avatars] Check for existing functions rather than using _once

Browse Source 
PHPBB3-10018
This commit is contained in:
Marc Alexander 2012-11-26 23:06:38 +01:00
parent 0abec06b09
commit cb1d98ab7f
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/avatar/driver/gravatar.php
View File

@ -95,7 +95,10 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
$row['avatar_width'] = $this->request->variable('avatar_gravatar_width', 0); $row['avatar_width'] = $this->request->variable('avatar_gravatar_width', 0);
$row['avatar_height'] = $this->request->variable('avatar_gravatar_height', 0); $row['avatar_height'] = $this->request->variable('avatar_gravatar_height', 0);
require_once($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext); if (!function_exists('user_add'))
{
require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
}
$error = array_merge($error, validate_data(array( $error = array_merge($error, validate_data(array(
'email' => $row['avatar'], 'email' => $row['avatar'],

11
phpBB/includes/avatar/driver/remote.php
View File

@ -82,7 +82,10 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
$url = 'http://' . $url; $url = 'http://' . $url;
} }
require_once($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext); if (!function_exists('user_add'))
{
require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
}
$error = array_merge($error, validate_data(array( $error = array_merge($error, validate_data(array(
'url' => $url, 'url' => $url,
@ -128,7 +131,11 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
return false; return false;
} }
include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext); if (!class_exists('fileupload'))
{
include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
}
$types = fileupload::image_types(); $types = fileupload::image_types();
$extension = strtolower(filespec::get_extension($url)); $extension = strtolower(filespec::get_extension($url));

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

@ -72,7 +72,10 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
return false; return false;
} }
include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext); if (!class_exists('fileupload'))
{
include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
}
$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false)); $upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));

5
phpBB/includes/ucp/ucp_profile.php
View File

@ -545,7 +545,10 @@ class ucp_profile
break; break;
case 'avatar': case 'avatar':
include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx); if (!function_exists('display_forums'))
{
include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
}
add_form_key('ucp_avatar'); add_form_key('ucp_avatar');