[Pkg-owncloud-commits] [owncloud] 98/107: Merge pull request #21198 from owncloud/fix_20296_8.2

[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 9154c5d8f45c92ce88fb4c3de00e7fc3d24be50c
Merge: 486fdcb 3fc5039
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue Dec 15 13:17:46 2015 +0100

    Merge pull request #21198 from owncloud/fix_20296_8.2
    
    [stable8.2] don't allow to create a federated share if source and target are the same

 apps/files_sharing/ajax/external.php               | 11 ++++++-
 apps/files_sharing/js/external.js                  |  3 +-
 apps/files_sharing/js/public.js                    |  7 ++--
 .../lib/controllers/sharecontroller.php            |  1 +
 apps/files_sharing/templates/public.php            |  2 +-
 .../tests/controller/sharecontroller.php           |  1 +
 apps/files_sharing/tests/js/externalSpec.js        |  4 +++
 lib/private/share/helper.php                       | 34 ++++++++++++++++++++
 lib/private/share/share.php                        | 13 ++++++--
 tests/lib/share/helper.php                         | 37 ++++++++++++++++++++++
 10 files changed, 105 insertions(+), 8 deletions(-)

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