[Pkg-owncloud-commits] [owncloud] 26/67: don't throw errors if certificate folder doesn't exist

[David Prévot]

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

taffit pushed a commit to annotated tag v4.5.1
in repository owncloud.

commit df7e5191596757b99032c0646996c67ad2623502
Author: Robin Appelman <icewind at owncloud.com>
Date:   Fri Oct 12 14:52:22 2012 +0200

    don't throw errors if certificate folder doesn't exist
---
 apps/files_external/lib/config.php |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index f770bfe..0a576f0 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -109,10 +109,10 @@ class OC_Mount_Config {
 		return $personal;
 	}
 
-	/**
-	 * Add directory for mount point to the filesystem
-	 * @param OC_Fileview instance $view
-	 * @param string path to mount point
+	/**
+	 * Add directory for mount point to the filesystem
+	 * @param OC_Fileview instance $view
+	 * @param string path to mount point
 	 */
 	private static function addMountPointDirectory($view, $path) {
 		$dir = '';
@@ -288,6 +288,9 @@ class OC_Mount_Config {
 		if (!is_dir($path)) mkdir($path);
 		$result = array();
 		$handle = opendir($path);
+		if (!$handle) {
+			return array();
+		}
 		while (false !== ($file = readdir($handle))) {
 			if($file != '.' && $file != '..') $result[] = $file;
 		}

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