diff options
| author | Simon Birnbach <simon@simon-birnbach.de> | 2012-04-15 15:59:57 +0200 |
|---|---|---|
| committer | Simon Birnbach <simon@simon-birnbach.de> | 2012-04-15 15:59:57 +0200 |
| commit | a384fcb99fc3a12d7dac937398bf827c79e86098 (patch) | |
| tree | 55a631751578cd1f642e5fa0f88fd2290509b126 /files/ajax/upload.php | |
| parent | 4e89a0faf652f2f100cca47cca54a3b35e720aad (diff) | |
| parent | 38cb716a572a8af136f6260089bc486413c6ca9f (diff) | |
| download | nextcloud-server-a384fcb99fc3a12d7dac937398bf827c79e86098.tar.gz nextcloud-server-a384fcb99fc3a12d7dac937398bf827c79e86098.zip | |
Merge git://gitorious.org/owncloud/owncloud
Conflicts:
files/css/files.css
files/js/files.js
Diffstat (limited to 'files/ajax/upload.php')
| -rw-r--r-- | files/ajax/upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/files/ajax/upload.php b/files/ajax/upload.php index f8b8f0e2e5f..af7a7acf702 100644 --- a/files/ajax/upload.php +++ b/files/ajax/upload.php @@ -14,7 +14,7 @@ if (!isset($_FILES['files'])) { } foreach ($_FILES['files']['error'] as $error) { if ($error != 0) { - $l=new OC_L10N('files'); + $l=OC_L10N::get('files'); $errors = array( 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'), |