From df8b7db1cdd988fdee6036b26978779f53591134 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Fri, 26 Aug 2022 15:56:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=BC=95=E5=AF=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Installer/Controllers/DatabaseController.php    | 3 ++-
 beike/Installer/Controllers/EnvironmentController.php | 2 +-
 beike/Installer/Views/environment-wizard.blade.php    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/beike/Installer/Controllers/DatabaseController.php b/beike/Installer/Controllers/DatabaseController.php
index deb7965d..59f9d824 100644
--- a/beike/Installer/Controllers/DatabaseController.php
+++ b/beike/Installer/Controllers/DatabaseController.php
@@ -6,6 +6,7 @@ use Beike\Admin\Repositories\AdminUserRepo;
 use Illuminate\Routing\Controller;
 use Beike\Installer\Helpers\DatabaseManager;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 
 class DatabaseController extends Controller
 {
@@ -44,7 +45,7 @@ class DatabaseController extends Controller
             'name' => substr($email, 0, strpos($email, '@')),
             'email' => $email,
             'password' => request('admin_password'),
-            'locale' => 'en',
+            'locale' => session('locale'),
             'active' => true,
         ];
         AdminUserRepo::createAdminUser($data);
diff --git a/beike/Installer/Controllers/EnvironmentController.php b/beike/Installer/Controllers/EnvironmentController.php
index b104bf81..9e526268 100644
--- a/beike/Installer/Controllers/EnvironmentController.php
+++ b/beike/Installer/Controllers/EnvironmentController.php
@@ -65,7 +65,7 @@ class EnvironmentController extends Controller
 
         $results = $this->EnvironmentManager->saveFileWizard($request);
 
-        return $redirect->route('installer.database')->withInput($request->only('admin_email', 'admin_password'))
+        return $redirect->route('installer.database')->withInput()
                         ->with(['results' => $results]);
     }
 
diff --git a/beike/Installer/Views/environment-wizard.blade.php b/beike/Installer/Views/environment-wizard.blade.php
index 908b41b9..c083ee8b 100644
--- a/beike/Installer/Views/environment-wizard.blade.php
+++ b/beike/Installer/Views/environment-wizard.blade.php
@@ -91,7 +91,7 @@
             {{ trans($entry_key . 'db_password_label') }}
           </label>
           <input class="form-control {{ $errors->has('database_password') ? 'is-invalid' : '' }}" name="database_password"
-            value="{{ old('database_password', '') }}" required placeholder="{{ trans($entry_key . 'db_password_placeholder') }}">
+            value="{{ old('database_password', '') }}" placeholder="{{ trans($entry_key . 'db_password_placeholder') }}">
           <span class="invalid-feedback"
             role="alert">{{ $errors->has('database_password') ? $errors->first('database_password') : __('common.error_required', ['name' => trans($entry_key . 'db_password_label')]) }}</span>
         </div>