merge

config/config.php

@@ -1,2 +1,11 @@
-<?php
+<?php 
-?>
+$CONFIG_INSTALLED=true;
+$CONFIG_DATADIRECTORY='/var/www/owncloud/owncloud/data';
+$CONFIG_HTTPFORCESSL=false;
+$CONFIG_DATEFORMAT='j M Y G:i';
+$CONFIG_DBTYPE='mysql';
+$CONFIG_DBNAME='owncloud';
+$CONFIG_DBHOST='localhost';
+$CONFIG_DBUSER='owncloud';
+$CONFIG_DBPASSWORD='gehijm';
+?> 

inc/lib_base.php

@@ -69,6 +69,10 @@ oc_require_once('lib_config.php');
 oc_require_once('lib_user.php');
 oc_require_once('lib_ocs.php');
 
+
+if(!is_dir($CONFIG_DATADIRECTORY)){
+	mkdir($CONFIG_DATADIRECTORY);
+}
 if(OC_USER::isLoggedIn()){
 	//jail the user in a seperate data folder
 	$CONFIG_DATADIRECTORY=$SERVERROOT.'/data/'.$_SESSION['username_clean'];