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

[ticket/10763] Make functions for remote avatars static

Browse Source 
fileupload::image_types() and filespec::get_extension() are called
statically while submitting the form for the remote avatar. Make them
static as described in the ticket in order to prevent a PHP notice.
Also change the tests to use the static functions.

PHPBB3-10763
This commit is contained in:
Marc Alexander
2012-12-17 12:59:44 +01:00
parent 9420647c43
commit 54d96dfac7
3 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/includes/functions_upload.php
View File

@@ -70,7 +70,7 @@ class filespec
$this->mimetype = 'application/octetstream';
}
$this->extension = strtolower($this->get_extension($this->realname));
$this->extension = strtolower(filespec::get_extension($this->realname));
// Try to get real filesize from temporary folder (not always working) ;)
$this->filesize = (@filesize($this->filename)) ? @filesize($this->filename) : $this->filesize;
@@ -187,8 +187,11 @@ class filespec
/**
* Get file extension
*
* @param string Filename that needs to be checked
* @return string Extension of the supplied filename
*/
function get_extension($filename)
static public function get_extension($filename)
{
if (strpos($filename, '.') === false)
{
@@ -369,7 +372,7 @@ class filespec
}
// Check image type
$types = $this->upload->image_types();
$types = fileupload::image_types();
if (!isset($types[$this->image_info[2]]) || !in_array($this->extension, $types[$this->image_info[2]]))
{
@@ -1019,9 +1022,11 @@ class fileupload
}
/**
* Return image type/extension mapping
* Get image type/extension mapping
*
* @return array Array containing the image types and their extensions
*/
function image_types()
static public function image_types()
{
return array(
IMAGETYPE_GIF => array('gif'),