diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-07-01 08:53:03 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-07-01 08:53:03 +0200 |
| commit | f25b71f70e878886a6f71faa43cd46c836ef13f7 (patch) | |
| tree | 41c6b468298410f5c65aeeaed8925f92f22943f8 /apps/files_sharing/api | |
| parent | b921748e61a05b65e9d58221bb2c44b02befb64d (diff) | |
| parent | dd3d0194a691c0718ec9c91d4e2f18ca0479e4a7 (diff) | |
| download | nextcloud-server-f25b71f70e878886a6f71faa43cd46c836ef13f7.tar.gz nextcloud-server-f25b71f70e878886a6f71faa43cd46c836ef13f7.zip | |
Merge pull request #15475 from rullzer/files_sharing_OCP_DB
Move files sharing app (mostly) to OCP\DB
Diffstat (limited to 'apps/files_sharing/api')
| -rw-r--r-- | apps/files_sharing/api/local.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php index 24f74455a75..308965192b9 100644 --- a/apps/files_sharing/api/local.php +++ b/apps/files_sharing/api/local.php @@ -164,7 +164,7 @@ class Local { } $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path` , `*PREFIX*share`.`permissions`, `stime`, `expiration`, `token`, `storage`, `mail_send`, `mail_send`'; - $getReshares = \OC_DB::prepare('SELECT ' . $select . ' FROM `*PREFIX*share` INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*share`.`file_source` = ? AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\') AND `uid_owner` != ?'); + $getReshares = \OCP\DB::prepare('SELECT ' . $select . ' FROM `*PREFIX*share` INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*share`.`file_source` = ? AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\') AND `uid_owner` != ?'); $reshares = $getReshares->execute(array($itemSource, \OCP\User::getUser()))->fetchAll(); foreach ($reshares as $key => $reshare) { @@ -575,7 +575,7 @@ class Local { $result = $query->execute($args); if (\OCP\DB::isError($result)) { - \OCP\Util::writeLog('files_sharing', \OC_DB::getErrorMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('files_sharing', \OCP\DB::getErrorMessage(), \OCP\Util::ERROR); return null; } if ($share = $result->fetchRow()) { |