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

[ticket/14168] Use language class and fix incorrect docblock

Browse Source 
PHPBB3-14168
This commit is contained in:
Marc Alexander
2015-09-19 16:45:51 +02:00
parent e50718008a
commit 07c8e21e80
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/phpbb/attachment/upload.php
View File

@@ -96,7 +96,7 @@ class upload
* *
* @return object filespec * @return object filespec
*/ */
public function upload($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = false) public function upload($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = array())
{ {
$filedata = array( $filedata = array(
'error' => array() 'error' => array()
@@ -115,7 +115,7 @@ class upload
if (!$filedata['post_attach']) if (!$filedata['post_attach'])
{ {
$filedata['error'][] = $this->user->lang['NO_UPLOAD_FORM_FOUND']; $filedata['error'][] = $this->language->lang('NO_UPLOAD_FORM_FOUND');
return $filedata; return $filedata;
} }
@@ -185,7 +185,7 @@ class upload
// If this error occurs a user tried to exploit an IE Bug by renaming extensions // If this error occurs a user tried to exploit an IE Bug by renaming extensions
// Since the image category is displaying content inline we need to catch this. // Since the image category is displaying content inline we need to catch this.
trigger_error($this->user->lang['ATTACHED_IMAGE_NOT_IMAGE']); trigger_error($this->language->lang('ATTACHED_IMAGE_NOT_IMAGE'));
} }
$filedata['filesize'] = $file->get('filesize'); $filedata['filesize'] = $file->get('filesize');
@@ -214,7 +214,7 @@ class upload
{ {
if (intval($this->config['upload_dir_size']) + $file->get('filesize') > $this->config['attachment_quota']) if (intval($this->config['upload_dir_size']) + $file->get('filesize') > $this->config['attachment_quota'])
{ {
$filedata['error'][] = $this->user->lang['ATTACH_QUOTA_REACHED']; $filedata['error'][] = $this->language->lang('ATTACH_QUOTA_REACHED');
$filedata['post_attach'] = false; $filedata['post_attach'] = false;
$file->remove(); $file->remove();
@@ -230,11 +230,11 @@ class upload
{ {
if ($this->auth->acl_get('a_')) if ($this->auth->acl_get('a_'))
{ {
$filedata['error'][] = $this->user->lang['ATTACH_DISK_FULL']; $filedata['error'][] = $this->language->lang('ATTACH_DISK_FULL');
} }
else else
{ {
$filedata['error'][] = $this->user->lang['ATTACH_QUOTA_REACHED']; $filedata['error'][] = $this->language->lang('ATTACH_QUOTA_REACHED');
} }
$filedata['post_attach'] = false; $filedata['post_attach'] = false;