From e43aaf4a15a56ec93d347c797cd4e7ef7691aef5 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 26 Jan 2016 18:50:41 +0100
Subject: Avoid error message in log during setup because of existing data dir

---
 lib/private/setup.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/private/setup.php b/lib/private/setup.php
index a96dade0665..b9f8828227e 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -194,7 +194,9 @@ class Setup {
 		// Create data directory to test whether the .htaccess works
 		// Notice that this is not necessarily the same data directory as the one
 		// that will effectively be used.
-		@mkdir($dataDir);
+		if(!file_exists($dataDir)) {
+			@mkdir($dataDir);
+		}
 		$htAccessWorking = true;
 		if (is_dir($dataDir) && is_writable($dataDir)) {
 			// Protect data directory here, so we can test if the protection is working
-- 
cgit v1.2.3