[Pkg-owncloud-commits] [owncloud] 81/86: Merge pull request #21199 from owncloud/fix_20296_8.1

[David Prévot]

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

taffit pushed a commit to annotated tag v8.1.5
in repository owncloud.

commit c3595bd50b7f7278d034a0f32bf2fb1fb8dc9b3f
Merge: b6caf41 f2fb9fb
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Tue Dec 15 14:56:23 2015 +0100

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

 apps/files_sharing/ajax/external.php               | 12 ++++++-
 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                       | 23 ++++++++++++++
 lib/private/share/share.php                        | 15 +++++++--
 tests/lib/share/helper.php                         | 37 ++++++++++++++++++++++
 10 files changed, 97 insertions(+), 8 deletions(-)

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