[Pkg-owncloud-commits] [owncloud] 182/258: Try to create datadirectory to test whether the .htaccess works

[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 f788dffce8903a633c95b05b83c7a4ba9e8c7c16
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Fri Sep 26 17:25:28 2014 +0200

    Try to create datadirectory to test whether the .htaccess works
    
    Fixes https://github.com/owncloud/core/pull/11299#issuecomment-56968588 and also https://github.com/owncloud/core/issues/10628 together with https://github.com/owncloud/core/pull/11299#issuecomment-56968588 when backported.
---
 core/setup/controller.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/setup/controller.php b/core/setup/controller.php
index fca16ea..3532719 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -116,9 +116,14 @@ class Controller {
 
 		$errors = array();
 
-		if (is_dir($datadir) and is_writable($datadir)) {
+		// 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 (is_dir($datadir) && is_writable($datadir)) {
 			// Protect data directory here, so we can test if the protection is working
 			\OC_Setup::protectDataDirectory();
+
 			try {
 				$htaccessWorking = \OC_Util::isHtaccessWorking();
 			} catch (\OC\HintException $e) {

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