aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/ajax/upload.php
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2013-02-25 17:56:40 -0500
committerMichael Gapczynski <mtgap@owncloud.com>2013-02-25 17:56:40 -0500
commit4a05e8820f5ff376c7e6076aee0b2c2e2c9cc94c (patch)
tree8486ff4dbafd1c6e892695b37e7346057759a413 /apps/files/ajax/upload.php
parent05a8766cbc5826a89e52248994e3e2d0b6c57be5 (diff)
parentd713948d3f85a6e0a369bf1a9052ce563250e3da (diff)
downloadnextcloud-server-4a05e8820f5ff376c7e6076aee0b2c2e2c9cc94c.tar.gz
nextcloud-server-4a05e8820f5ff376c7e6076aee0b2c2e2c9cc94c.zip
Merge branch 'master' into external_storage_ui_feedback
Diffstat (limited to 'apps/files/ajax/upload.php')
-rw-r--r--apps/files/ajax/upload.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 9031c729eff..5b697777e47 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -26,8 +26,7 @@ foreach ($_FILES['files']['error'] as $error) {
UPLOAD_ERR_OK => $l->t('There is no error, the file uploaded with success'),
UPLOAD_ERR_INI_SIZE => $l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini: ')
. ini_get('upload_max_filesize'),
- UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified'
- . ' in the HTML form'),
+ UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
UPLOAD_ERR_PARTIAL => $l->t('The uploaded file was only partially uploaded'),
UPLOAD_ERR_NO_FILE => $l->t('No file was uploaded'),
UPLOAD_ERR_NO_TMP_DIR => $l->t('Missing a temporary folder'),