From c4b3cc89b0b8f30fcfdd2e0c59ea4683f31d9202 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Fri, 15 Mar 2019 13:21:47 +0800 Subject: [PATCH] Fix redirecting in setup --- .env.example | 2 ++ app/Http/Controllers/SetupController.php | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/.env.example b/.env.example index fc7f1942..dbe6505e 100644 --- a/.env.example +++ b/.env.example @@ -52,6 +52,8 @@ SALT = 2c5ca184f017a9a1ffbd198ef69b0c0e # APP_KEY = base64:gkb/zouNF6UOSfnr/o+izVMS57WQS3+62YqZBuDyBhU= +FIRST_RUN = true + # Mail Configuration # # Leave MAIL_DRIVER empty to disable features involving sending emails. diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index 61c5ed3d..72c8eff2 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -76,6 +76,11 @@ class SetupController extends Controller 'DB_PREFIX = '.$request->input('prefix'), $content ); + $content = str_replace( + 'FIRST_RUN = true', + '', + $content + ); File::put('..'.DIRECTORY_SEPARATOR.'.env', $content); return redirect('setup/info'); @@ -251,6 +256,12 @@ class SetupController extends Controller } } + // @codeCoverageIgnoreStart + if (env('FIRST_RUN') && request()->is('/')) { + return false; + } + // @codeCoverageIgnoreEnd + $existingTables = []; $tables = $tables ?: ['users', 'user_closet', 'players', 'textures', 'options'];