summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-09-20 15:36:22 +0200
committerFlorian Pritz <bluewind@xinu.at>2015-09-20 15:36:22 +0200
commitffacb290fa8a30e6f3e507bf6842b281efbcd558 (patch)
treedfa365cfc9e0f3116d9cce2a3a779d110c8e3358 /application/controllers
parentdf0696a066e68ca020f9b12fbeff3a4d28341889 (diff)
postgres: Adapt MySQL query for thumbnail history
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/file.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index a78f89bb0..f484c5260 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -684,10 +684,10 @@ class File extends MY_Controller {
->from('files')
->join('file_storage', 'file_storage.id = files.file_storage_id')
->where('
- (user = '.$this->db->escape($user).')
+ (files.user = '.$this->db->escape($user).')
AND (
- mimetype LIKE "image%"
- OR mimetype IN ("application/pdf")
+ mimetype LIKE \'image%\'
+ OR mimetype IN (\'application/pdf\')
)', null, false)
->order_by('date', 'desc')
->get()->result_array();