[Pkg-owncloud-commits] [owncloud] 48/78: Merge pull request #15332 from owncloud/dont_hide_exceptions

[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 e72cd711ad63f45b35272efeafe83b30445a1ea0
Merge: 03c9657 598f798
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Apr 22 22:48:29 2015 +0200

    Merge pull request #15332 from owncloud/dont_hide_exceptions
    
    do not hide exception when ldap server has a hiccup

 apps/files_encryption/lib/util.php          |  11 +-
 apps/files_encryption/tests/hooks.php       |  24 +--
 apps/user_ldap/lib/connection.php           |   7 +-
 apps/user_ldap/lib/ldap.php                 |   4 +
 apps/user_ldap/lib/user/manager.php         |  17 +-
 apps/user_ldap/tests/user/manager.php       |   4 -
 apps/user_ldap/tests/user_ldap.php          | 237 ++++++++++++++++++++++------
 apps/user_ldap/user_ldap.php                |  16 +-
 core/js/share.js                            |   4 +
 core/templates/login.php                    |   6 +
 lib/base.php                                |  24 +--
 lib/private/files/filesystem.php            |  62 ++++----
 lib/private/hook.php                        |   3 +
 lib/private/servernotavailableexception.php |  27 ++++
 lib/private/user/nouserexception.php        |  14 ++
 tests/lib/files/filesystem.php              |   9 +-
 16 files changed, 343 insertions(+), 126 deletions(-)

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