[Pkg-owncloud-commits] [owncloud] 33/63: Merge pull request #21202 from owncloud/fix_20296_8.0

[David Prévot]

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

taffit pushed a commit to branch stable8.0
in repository owncloud.

commit cc79334accd3ae2c3514124673d2bf3e841c900e
Merge: 79857c9 91d1779
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Tue Dec 15 14:56:13 2015 +0100

    Merge pull request #21202 from owncloud/fix_20296_8.0
    
    [stable8.0] 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                       |  97 ++++++++++++++++++
 lib/private/share/share.php                        |  17 +++-
 tests/lib/share/helper.php                         | 109 +++++++++++++++++++++
 10 files changed, 244 insertions(+), 8 deletions(-)

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