[Pkg-owncloud-commits] [owncloud] 136/205: Merge pull request #17008 from owncloud/fix-17006

[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 b318b9cf17a1225e0b43f659ea279b54fd61bf07
Merge: 796aae4 738b78f
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Fri Jun 26 16:01:16 2015 +0200

    Merge pull request #17008 from owncloud/fix-17006
    
    Improve splitting of username and remote adress when username contains an `@`

 apps/files_sharing/api/local.php |  4 ++
 core/ajax/share.php              |  2 +
 lib/private/share/helper.php     | 80 +++++++++++++++++++++++++++++++---------
 lib/private/share/share.php      | 12 +++---
 lib/public/share.php             |  1 +
 tests/lib/share/helper.php       | 73 +++++++++++++++++++++++-------------
 tests/lib/share/share.php        | 29 +++++++++++++++
 7 files changed, 152 insertions(+), 49 deletions(-)


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