diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-09-19 16:45:51 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-09 09:46:10 +0200 |
| commit | 07c8e21e8033f35483b5c96653f616b6f094138e (patch) | |
| tree | ed4f1398c9a334b63fd26860d026db96df3e7a19 /phpBB | |
| parent | e50718008a44953181e133de1e37304ed6a5994f (diff) | |
| download | forums-07c8e21e8033f35483b5c96653f616b6f094138e.tar forums-07c8e21e8033f35483b5c96653f616b6f094138e.tar.gz forums-07c8e21e8033f35483b5c96653f616b6f094138e.tar.bz2 forums-07c8e21e8033f35483b5c96653f616b6f094138e.tar.xz forums-07c8e21e8033f35483b5c96653f616b6f094138e.zip | |
[ticket/14168] Use language class and fix incorrect docblock
PHPBB3-14168
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/attachment/upload.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/phpbb/attachment/upload.php b/phpBB/phpbb/attachment/upload.php index a175dee0b3..c7de323699 100644 --- a/phpBB/phpbb/attachment/upload.php +++ b/phpBB/phpbb/attachment/upload.php @@ -96,7 +96,7 @@ class upload * * @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( 'error' => array() @@ -115,7 +115,7 @@ class upload if (!$filedata['post_attach']) { - $filedata['error'][] = $this->user->lang['NO_UPLOAD_FORM_FOUND']; + $filedata['error'][] = $this->language->lang('NO_UPLOAD_FORM_FOUND'); return $filedata; } @@ -185,7 +185,7 @@ class upload // 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. - trigger_error($this->user->lang['ATTACHED_IMAGE_NOT_IMAGE']); + trigger_error($this->language->lang('ATTACHED_IMAGE_NOT_IMAGE')); } $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']) { - $filedata['error'][] = $this->user->lang['ATTACH_QUOTA_REACHED']; + $filedata['error'][] = $this->language->lang('ATTACH_QUOTA_REACHED'); $filedata['post_attach'] = false; $file->remove(); @@ -230,11 +230,11 @@ class upload { if ($this->auth->acl_get('a_')) { - $filedata['error'][] = $this->user->lang['ATTACH_DISK_FULL']; + $filedata['error'][] = $this->language->lang('ATTACH_DISK_FULL'); } else { - $filedata['error'][] = $this->user->lang['ATTACH_QUOTA_REACHED']; + $filedata['error'][] = $this->language->lang('ATTACH_QUOTA_REACHED'); } $filedata['post_attach'] = false; |