summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2013-07-18 12:40:02 +0200
committerFlorian Pritz <bluewind@xinu.at>2013-07-18 12:40:02 +0200
commite64dedc8463a705b50f261e123491a9f7353dadb (patch)
tree6f65e62b547edd400deda441682d91e4a5202ba6 /application/controllers
parent3f6573b15c7395a76b9ee5e810331975baf080cf (diff)
Add json support to upload_history
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/file.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index 2ff774c8a..630e550de 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -415,6 +415,10 @@ class File extends CI_Controller {
ORDER BY date $order
", array($user))->result_array();
+ if ($this->input->get("json") !== false) {
+ return send_json_reply($query);
+ }
+
foreach($query as $key => $item) {
$query[$key]["filesize"] = format_bytes($item["filesize"]);
if (is_cli_client()) {