diff options
| author | Florian Pritz <bluewind@xinu.at> | 2015-09-20 16:03:22 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-09-20 16:03:22 +0200 |
| commit | 7da9de48d2b3bbb0309d6311e4dc7d275d3bf26d (patch) | |
| tree | bc90956bccaad107255e350ed29cad242eede5cc /application/controllers/file.php | |
| parent | f149a0d1abb4a79b1d5de9ddb5963b2eab4b126d (diff) | |
| parent | e79c1c45dcd23dde1f4b072993829cc008f4858b (diff) | |
Merge branch 'postgres' into dev
Diffstat (limited to 'application/controllers/file.php')
| -rw-r--r-- | application/controllers/file.php | 6 |
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(); |