diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-01-01 01:18:02 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-01-01 01:18:02 +0000 |
| commit | cbb2db8622dbcff2314204bc548ebdd3005bd0fc (patch) | |
| tree | bbe14faf0201b4131b8ca9c9d4eac59edb7da5e8 /files/ajax | |
| parent | e7de25434206a4849a7c7315d4d9926325c7b730 (diff) | |
| parent | eb4cd869107d4afa1c259751e765ca39defb9279 (diff) | |
| download | nextcloud-server-cbb2db8622dbcff2314204bc548ebdd3005bd0fc.tar.gz nextcloud-server-cbb2db8622dbcff2314204bc548ebdd3005bd0fc.zip | |
Fix merge conflicts
Diffstat (limited to 'files/ajax')
| -rw-r--r-- | files/ajax/newfolder.php | 2 | ||||
| -rw-r--r-- | files/ajax/upload.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/files/ajax/newfolder.php b/files/ajax/newfolder.php index 6966e912c56..d244fb7be19 100644 --- a/files/ajax/newfolder.php +++ b/files/ajax/newfolder.php @@ -9,7 +9,7 @@ OC_JSON::checkLoggedIn(); $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; $foldername = isset( $_GET['foldername'] ) ? $_GET['foldername'] : ''; -if($foldername == '') { +if(trim($foldername) == '') { OC_JSON::error(array("data" => array( "message" => "Empty Foldername" ))); exit(); } diff --git a/files/ajax/upload.php b/files/ajax/upload.php index 041ec0c92e3..5f0f68d9531 100644 --- a/files/ajax/upload.php +++ b/files/ajax/upload.php @@ -14,9 +14,10 @@ if (!isset($_FILES['files'])) { } foreach ($_FILES['files']['error'] as $error) { if ($error != 0) { + $l=new OC_L10N('files'); $errors = array( 0=>$l->t("There is no error, the file uploaded with success"), - 1=>$l->t("The uploaded file exceeds the upload_max_filesize directive in php.ini"), + 1=>$l->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'), 2=>$l->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"), 3=>$l->t("The uploaded file was only partially uploaded"), 4=>$l->t("No file was uploaded"), |