mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 19:54:12 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2018-12-24 15:32:58 +01:00
parent 08e1a7a9e1 58856c06b0
commit c79da081d8
21 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/phpbb/files/upload.php
View File

@@ -261,7 +261,7 @@ class upload
*
* @param filespec $file Instance of filespec class
*/
public function common_checks(&$file)
public function common_checks($file)
{
// Filesize is too big or it's 0 if it was larger than the maxsize in the upload form
if ($this->max_filesize && ($file->get('filesize') > $this->max_filesize || $file->get('filesize') == 0))
@@ -297,7 +297,7 @@ class upload
*
* @return bool True if extension is allowed, false if not
*/
public function valid_extension(&$file)
public function valid_extension($file)
{
return (in_array($file->get('extension'), $this->allowed_extensions)) ? true : false;
}
@@ -310,7 +310,7 @@ class upload
* @return bool True if dimensions are valid or no constraints set, false
* if not
*/
public function valid_dimensions(&$file)
public function valid_dimensions($file)
{
if (!$this->max_width && !$this->max_height && !$this->min_width && !$this->min_height)
{
@@ -350,7 +350,7 @@ class upload
*
* @return bool True if content is valid, false if not
*/
public function valid_content(&$file)
public function valid_content($file)
{
return ($file->check_content($this->disallowed_content));
}