Skip to content
GitLab
Commit f3c06ae4 authored by Bart Visscher's avatar Bart Visscher
Browse files

Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better 

Handle empty datafolder better.
parents 37868818 3ab97312
Hide whitespace changes
Inline Side-by-side
core/templates/installation.php
View file @ f3c06ae4
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
<div id="datadirContent"> <div id="datadirContent">
<label for="directory"><?php p($l->t( 'Data folder' )); ?></label> <label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
<input type="text" name="directory" id="directory" <input type="text" name="directory" id="directory"
placeholder="<?php p(OC::$SERVERROOT."/data"); ?>"
value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" /> value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" />
</div> </div>
</fieldset> </fieldset>
......
lib/setup.php
View file @ f3c06ae4
...@@ -37,7 +37,7 @@ class OC_Setup { ...@@ -37,7 +37,7 @@ class OC_Setup {
$error[] = $l->t('Set an admin password.'); $error[] = $l->t('Set an admin password.');
} }
if(empty($options['directory'])) { 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 if($dbtype == 'mysql' or $dbtype == 'pgsql' or $dbtype == 'oci' or $dbtype == 'mssql') { //mysql and postgresql needs more config options
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment