[Pkg-owncloud-commits] [owncloud] 227/273: Merge pull request #9329 from owncloud/sharing_check_target

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit ed29e7d1606ae073ab156ab1bf086ddec2b94bb3
Merge: f1f66ff bb93597
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Wed Jul 2 21:01:03 2014 +0200

    Merge pull request #9329 from owncloud/sharing_check_target
    
    don't move a share mount point into a different mount point

 apps/files_sharing/lib/external/mount.php          |  1 +
 apps/files_sharing/lib/helper.php                  |  1 +
 apps/files_sharing/lib/sharedmount.php             | 10 ------
 .../files/objectstore/homeobjectstorestorage.php   |  2 +-
 lib/private/files/storage/home.php                 |  2 +-
 lib/private/files/view.php                         | 41 ++++++++++++++++++----
 lib/public/files/storage.php                       |  4 +++
 7 files changed, 42 insertions(+), 19 deletions(-)

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