]> source.dussan.org Git - nextcloud-server.git/commit
Fix merging backend results
authorRoeland Jago Douma <roeland@famdouma.nl>
Tue, 1 Nov 2016 11:15:14 +0000 (12:15 +0100)
committerRoeland Jago Douma <roeland@famdouma.nl>
Tue, 1 Nov 2016 11:16:05 +0000 (12:16 +0100)
commitfc4d0a86efef1af4d7ea17547e259cfdd16e82b4
tree7a493b8df05af9b2f0ceb4b83b1316a38330029a
parentce7eb02685940c3d8490965cfc150a591fd92762
Fix merging backend results

* Merge share types correctly
* Filter share types
* Order share types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
apps/dav/lib/Connector/Sabre/SharesPlugin.php
apps/federatedfilesharing/lib/FederatedShareProvider.php
lib/private/Share20/DefaultShareProvider.php
lib/private/Share20/Manager.php