diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-04-17 00:44:14 -0700 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-04-17 00:44:14 -0700 |
| commit | f3c06ae4e41521f5f2439300f6ecb263cd9786ed (patch) | |
| tree | f927abf5e706c783542509ecdd85f2663f3055f3 | |
| parent | 37868818ffdb2e37de99bf342eeb1b3665fbb611 (diff) | |
| parent | 3ab97312b8ee1f0487ced163e9b9a7474306d8db (diff) | |
| download | nextcloud-server-f3c06ae4e41521f5f2439300f6ecb263cd9786ed.tar.gz nextcloud-server-f3c06ae4e41521f5f2439300f6ecb263cd9786ed.zip | |
Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better
Handle empty datafolder better.
| -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 c034fe5b52f..de7ff8c168c 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::$SERVERROOT."/data"); ?>" 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 |