Skip to content

Commit

Permalink
Merge pull request #26734 from RealRancor/sqlite_warning_top
Browse files Browse the repository at this point in the history
Moved SQLite setup warning to top.
  • Loading branch information
Vincent Petry authored Nov 29, 2016
2 parents bfc7f16 + 92a7c8b commit 098b1bf
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions settings/templates/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,19 @@
<li>
<?php p($l->t('If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the "overwrite.cli.url" option in your config.php file to the webroot path of your installation (Suggested: "%s")', $_['suggestedOverwriteCliUrl'])); ?>
</li>

<?php
}

// SQLite database performance issue
if ($_['databaseOverload']) {
?>
<li>
<?php p($l->t('SQLite is used as database. For larger installations we recommend to switch to a different database backend.')); ?><br>
<?php p($l->t('Especially when using the desktop client for file syncing the use of SQLite is discouraged.')); ?><br>
<?php print_unescaped($l->t('To migrate to another database use the command line tool: \'occ db:convert-type\', or see the <a target="_blank" rel="noreferrer" href="%s">documentation ↗</a>.', link_to_docs('admin-db-conversion') )); ?>
</li>

<?php
}

Expand Down Expand Up @@ -525,16 +538,6 @@
<div class="section" id="admin-tips">
<h2><?php p($l->t('Tips & tricks'));?></h2>
<ul>
<?php
// SQLite database performance issue
if ($_['databaseOverload']) {
?>
<li>
<?php p($l->t('SQLite is used as database. For larger installations we recommend to switch to a different database backend.')); ?><br>
<?php p($l->t('Especially when using the desktop client for file syncing the use of SQLite is discouraged.')); ?><br>
<?php print_unescaped($l->t('To migrate to another database use the command line tool: \'occ db:convert-type\', or see the <a target="_blank" rel="noreferrer" href="%s">documentation ↗</a>.', link_to_docs('admin-db-conversion') )); ?>
</li>
<?php } ?>
<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-backup')); ?>"><?php p($l->t('How to do backups'));?> ↗</a></li>
<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-monitoring')); ?>"><?php p($l->t('Advanced monitoring'));?> ↗</a></li>
<li><a target="_blank" rel="noreferrer" href="<?php p(link_to_docs('admin-performance')); ?>"><?php p($l->t('Performance tuning'));?> ↗</a></li>
Expand Down

0 comments on commit 098b1bf

Please sign in to comment.