[Pkg-owncloud-commits] [owncloud] 11/131: handle invalid results from mount providers

[David Prévot]

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

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

commit a95b5c3b3e234880c260b4dda4cee20777ca4fca
Author: Robin Appelman <icewind at owncloud.com>
Date:   Mon Jun 29 14:42:14 2015 +0200

    handle invalid results from mount providers
---
 lib/private/files/config/mountprovidercollection.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/private/files/config/mountprovidercollection.php b/lib/private/files/config/mountprovidercollection.php
index 7db0aff..c75c64a 100644
--- a/lib/private/files/config/mountprovidercollection.php
+++ b/lib/private/files/config/mountprovidercollection.php
@@ -60,7 +60,10 @@ class MountProviderCollection implements IMountProviderCollection, Emitter {
 		$mounts = array_map(function (IMountProvider $provider) use ($user, $loader) {
 			return $provider->getMountsForUser($user, $loader);
 		}, $this->providers);
-		return array_reduce($mounts, function ($mounts, $providerMounts) {
+		$mounts = array_filter($mounts, function ($result) {
+			return is_array($result);
+		});
+		return array_reduce($mounts, function (array $mounts, array $providerMounts) {
 			return array_merge($mounts, $providerMounts);
 		}, array());
 	}

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