wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better

Browse source 
Handle empty datafolder better.
This commit is contained in:
Bart Visscher 2013-04-17 00:44:14 -07:00
commit f3c06ae4e4
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/templates/installation.php
View file

@ -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>

2
lib/setup.php
View file

@ -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