From d759dca2038c669a59168a168a1e047392a157b4 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Sat, 13 Apr 2013 15:56:01 +0200
Subject: [PATCH] Handle empty datafolder better.

If datafolder is erased, the default value will be shown as a placeholder.

If installation is submitted without a datafolder the default value will be used.
---
 core/templates/installation.php | 1 +
 lib/setup.php                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/templates/installation.php b/core/templates/installation.php
index c70903cba55..79510042307 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -63,6 +63,7 @@
 		<div id="datadirContent">
 			<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
 			<input type="text" name="directory" id="directory"
+				placeholder="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>"
 				value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" />
 		</div>
 	</fieldset>
diff --git a/lib/setup.php b/lib/setup.php
index 7082f0b2afd..769fae11656 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -37,7 +37,7 @@ class OC_Setup {
 			$error[] = $l->t('Set an admin password.');
 		}
 		if(empty($options['directory'])) {
-			$error[] = $l->t('Specify a data folder.');
+			$options['directory'] = OC::$SERVERROOT."/data";
 		}
 
 		if($dbtype == 'mysql' or $dbtype == 'pgsql' or $dbtype == 'oci' or $dbtype == 'mssql') { //mysql and postgresql needs more config options