Merge branch 'master' into develop

2018-03-23 06:15:55 -04:00
parent 046046e0c4 bacc5de3a2
commit 27d94023ee
70 changed files with 27138 additions and 26508 deletions
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -39,7 +39,7 @@ Config::load();
 check_db(true);

 // Quit when in maintenance
-if (Config::get('system', 'maintenance', true)) {
+if (Config::get('system', 'maintenance', false, true)) {
 	return;
 }