summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-09-26 00:46:54 +0200
committerFlorian Pritz <bluewind@xinu.at>2015-09-26 00:47:37 +0200
commitc97c35162f5deee42bc384482d4673623e20ecc8 (patch)
tree8900226cc2253cf4c3c6f896bc814916fd194068 /application
parent7da9de48d2b3bbb0309d6311e4dc7d275d3bf26d (diff)
f/cron: Fix missing field when deleting unowned uploads
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application')
-rw-r--r--application/controllers/file.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index f484c5260..7d701b75e 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -1062,10 +1062,11 @@ class File extends MY_Controller {
"sess_expiration" => $this->config->item("sess_expiration"),
);
- $query = $this->db->select('file_storage_id storage_id, id, user, date')
+ $query = $this->db->select('file_storage_id storage_id, files.id, user, files.date, hash')
->from('files')
+ ->join('file_storage', "file_storage.id = files.file_storage_id")
->where("user", 0)
- ->where("date <", $oldest_session_time)
+ ->where("files.date <", $oldest_session_time)
->get()->result_array();
foreach($query as $row) {