[Pkg-owncloud-commits] [owncloud] 75/457: Fix unexisting class and broken doc

[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 d832c4ae2302c56169afccad9cbfe845323f295b
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Tue May 19 15:27:50 2015 +0200

    Fix unexisting class and broken doc
---
 apps/files_sharing/lib/sharedstorage.php             | 2 +-
 lib/private/files/objectstore/objectstorestorage.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 10a37c7..a833f4e 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -70,7 +70,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	 * Get the source file path, permissions, and owner for a shared file
 	 *
 	 * @param string $target Shared target file path
-	 * @return Returns array with the keys path, permissions, and owner or false if not found
+	 * @return array Returns array with the keys path, permissions, and owner or false if not found
 	 */
 	public function getFile($target) {
 		if (!isset($this->files[$target])) {
diff --git a/lib/private/files/objectstore/objectstorestorage.php b/lib/private/files/objectstore/objectstorestorage.php
index 3c92665..72baa1b 100644
--- a/lib/private/files/objectstore/objectstorestorage.php
+++ b/lib/private/files/objectstore/objectstorestorage.php
@@ -220,7 +220,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 			\OC\Files\Stream\Dir::register('objectstore' . $path . '/', $files);
 
 			return opendir('fakedir://objectstore' . $path . '/');
-		} catch (Exception $e) {
+		} catch (\Exception $e) {
 			\OCP\Util::writeLog('objectstore', $e->getMessage(), \OCP\Util::ERROR);
 			return false;
 		}

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