diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-10-12 03:28:44 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-10-12 03:28:44 -0700 |
| commit | e6d034a60b89be0f24702974d9c9d383ee2b374d (patch) | |
| tree | 74326619307e402d3290d363acf640eaf66f1cbe /core/templates | |
| parent | fce198874f228b96016224460658114bed2373bb (diff) | |
| parent | 8ce3ae50f0894574bab1e086e1fe83cebc3b5633 (diff) | |
| download | nextcloud-server-e6d034a60b89be0f24702974d9c9d383ee2b374d.tar.gz nextcloud-server-e6d034a60b89be0f24702974d9c9d383ee2b374d.zip | |
Merge pull request #5290 from owncloud/fixing-5191-master
Installation. Show advanced section on error. Fixes #5191
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/installation.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/templates/installation.php b/core/templates/installation.php index 5a103762269..a6f55cb0e28 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -61,13 +61,13 @@ </p> </fieldset> - <?php if(!$_['directoryIsSet'] OR !$_['dbIsSet']): ?> + <?php if(!$_['directoryIsSet'] OR !$_['dbIsSet'] OR count($_['errors']) > 0): ?> <fieldset id="advancedHeader"> <legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend> </fieldset> <?php endif; ?> - <?php if(!$_['directoryIsSet']): ?> + <?php if(!$_['directoryIsSet'] OR count($_['errors']) > 0): ?> <fieldset id="datadirField"> <div id="datadirContent"> <label for="directory"><?php p($l->t( 'Data folder' )); ?></label> @@ -78,7 +78,7 @@ </fieldset> <?php endif; ?> - <?php if(!$_['dbIsSet']): ?> + <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> <fieldset id='databaseField'> <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> |