upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #11542 from owncloud/fix_failing_unit_tests

Browse source 
distinguish between file dependent shares and other shares
This commit is contained in:
Björn Schießle 2014-10-13 17:01:13 +02:00
commit 48ce2ef18b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/share/share.php
View file

@ -293,9 +293,10 @@ class Share extends \OC\Share\Constants {
public static function getItemSharedWithUser($itemType, $itemSource, $user) {
$shares = array();
$fileDependend = false;
$column = ($itemType === 'file' || $itemType === 'folder') ? 'file_source' : 'item_source';
if ($itemType === 'file' || $itemType === 'folder') {
$fileDependend = true;
$column = 'file_source';
$where = 'INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE';
} else {
@ -303,7 +304,7 @@ class Share extends \OC\Share\Constants {
$where = 'WHERE';
}
$select = self::createSelectStatement(self::FORMAT_NONE, true);
$select = self::createSelectStatement(self::FORMAT_NONE, $fileDependend);
$where .= ' `' . $column . '` = ? AND `item_type` = ? ';
$arguments = array($itemSource, $itemType);