Merge branch '2.3' into 2.4

2016-08-07 22:07:30 +01:00
parent f3a5a8e230 14127de3ca
commit 5a8ad3bd06
81 changed files with 365 additions and 357 deletions
--- a/app/Subscribers/CommandSubscriber.php
+++ b/app/Subscribers/CommandSubscriber.php
@@ -134,6 +134,13 @@ class CommandSubscriber

        $command->line('Settings cache cleared!');

+        // SQLite does not backup.
+        if ($this->config->get('database.default') === 'sqlite') {
+            $command->line('Backup skipped: SQLite is not supported.');
+
+            return;
+        }
+
        $command->line('Backing up database...');

        try {