diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-28 10:39:23 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-28 10:39:23 -0500 |
| commit | b5989c933f3c51887724d89e989a3e2af4207d6e (patch) | |
| tree | 40677bfa8daa1357b1ca3a561b551a142cbe6c82 /apps/files_sharing/lib/cache.php | |
| parent | ea83acedebbcf70b19643efe82b72fb139cf8ad2 (diff) | |
| parent | 93e713d3781c5d5fc6d0dbb6c6a0a8f9c2e15b97 (diff) | |
| download | nextcloud-server-b5989c933f3c51887724d89e989a3e2af4207d6e.tar.gz nextcloud-server-b5989c933f3c51887724d89e989a3e2af4207d6e.zip | |
Merge branch 'master' into shared-folder-etags
Conflicts:
apps/files_sharing/lib/sharedstorage.php
Diffstat (limited to 'apps/files_sharing/lib/cache.php')
| -rw-r--r-- | apps/files_sharing/lib/cache.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 851e958f686..6f834e08999 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -79,8 +79,9 @@ class Shared_Cache extends Cache { } } else { $query = \OC_DB::prepare( - 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted` - FROM `*PREFIX*filecache` WHERE `fileid` = ?'); + 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`,' + .' `size`, `mtime`, `encrypted`' + .' FROM `*PREFIX*filecache` WHERE `fileid` = ?'); $result = $query->execute(array($file)); $data = $result->fetchRow(); $data['fileid'] = (int)$data['fileid']; |