[Pkg-owncloud-commits] [owncloud] 24/79: Merge pull request #18104 from owncloud/share-group-conflict-81

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 7c58985ca121c29099122a5b9f9f921f02aa630e
Merge: 18ec257 b91f002
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Aug 12 10:20:44 2015 +0200

    Merge pull request #18104 from owncloud/share-group-conflict-81
    
    [8.1] Re-use the share entry we have for the shared storage instead of searching for it every time

 apps/files_sharing/lib/cache.php           |  4 +--
 apps/files_sharing/lib/share/file.php      | 26 ++++++--------------
 apps/files_sharing/lib/sharedstorage.php   |  4 +--
 apps/files_sharing/tests/sharedstorage.php | 39 ++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 23 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git