|
|
|
@ -732,7 +732,7 @@ class Share extends Constants {
|
|
|
|
|
foreach ($result as $key => $r) {
|
|
|
|
|
// for file/folder shares we need to compare file_source, otherwise we compare item_source
|
|
|
|
|
// only group shares if they already point to the same target, otherwise the file where shared
|
|
|
|
|
// before grouping of shares was added. In this case we don't group them toi avoid confusions
|
|
|
|
|
// before grouping of shares was added. In this case we don't group them to avoid confusions
|
|
|
|
|
if (($fileSharing && $item['file_source'] === $r['file_source'] && $item['file_target'] === $r['file_target']) ||
|
|
|
|
|
(!$fileSharing && $item['item_source'] === $r['item_source'] && $item['item_target'] === $r['item_target'])) {
|
|
|
|
|
// add the first item to the list of grouped shares
|
|
|
|
@ -757,7 +757,7 @@ class Share extends Constants {
|
|
|
|
|
/**
|
|
|
|
|
* construct select statement
|
|
|
|
|
* @param int $format
|
|
|
|
|
* @param boolean $fileDependent ist it a file/folder share or a generla share
|
|
|
|
|
* @param boolean $fileDependent ist it a file/folder share or a general share
|
|
|
|
|
* @param string $uidOwner
|
|
|
|
|
* @return string select statement
|
|
|
|
|
*/
|
|
|
|
|