diff options
| author | kondou <kondou@ts.unde.re> | 2013-04-13 15:56:01 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-04-13 15:56:01 +0200 |
| commit | d759dca2038c669a59168a168a1e047392a157b4 (patch) | |
| tree | 80b838ae39ee9324943b707afe9bb144959104ec | |
| parent | f9e7d4ce2525cc4a101e36ae4aec41aabd69a902 (diff) | |
| download | nextcloud-server-d759dca2038c669a59168a168a1e047392a157b4.tar.gz nextcloud-server-d759dca2038c669a59168a168a1e047392a157b4.zip | |
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.
| -rw-r--r-- | core/templates/installation.php | 1 | ||||
| -rw-r--r-- | lib/setup.php | 2 |
2 files changed, 2 insertions, 1 deletions
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 |