summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--files/ajax/upload.php4
-rw-r--r--files/js/files.js2
2 files changed, 4 insertions, 2 deletions
diff --git a/files/ajax/upload.php b/files/ajax/upload.php
index b3facf96723..79b6c0b284c 100644
--- a/files/ajax/upload.php
+++ b/files/ajax/upload.php
@@ -27,6 +27,8 @@ and $_SESSION['username'] and strpos($dir,'..') === false){
}
}
-echo json_encode(array( "status" => "error"));
+$error = $_FILES['file']['error'];
+
+echo json_encode(array( 'status' => 'error', 'data' => array('error' => $error)));
?>
diff --git a/files/js/files.js b/files/js/files.js
index ba08e254349..9eeeb7f6bfd 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -53,7 +53,7 @@ function uploadFinished() {
result = $('#file_upload_target').contents().text();
result = eval("(" + result + ");");
if(result.status == "error") {
- alert('An error occcured, upload failed.');
+ alert('An error occcured, upload failed.\nError code: ' + result.data.error);
} else {
location.href = 'index.php?dir=' + $('#dir').val();
}