From 4c34d0867daf6df536f57a1ebfbca2e6442bde90 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Mon, 31 Aug 2015 09:10:27 +0200 Subject: [PATCH] Add field for table prefix in web installer Related to #269. --- src/Install/Actions/InstallAction.php | 3 +-- views/install/install.php | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Install/Actions/InstallAction.php b/src/Install/Actions/InstallAction.php index 0cfeece54..045070eca 100644 --- a/src/Install/Actions/InstallAction.php +++ b/src/Install/Actions/InstallAction.php @@ -17,7 +17,6 @@ use Zend\Diactoros\Response\JsonResponse; use Zend\Diactoros\Response; use Flarum\Install\Console\InstallCommand; use Flarum\Install\Console\DefaultData; -use Flarum\Core\Users\User; use Flarum\Api\Commands\GenerateAccessToken; use Flarum\Forum\Actions\WritesRememberCookie; use Symfony\Component\Console\Output\StreamOutput; @@ -60,7 +59,7 @@ class InstallAction extends Action 'database' => array_get($input, 'mysqlDatabase'), 'username' => array_get($input, 'mysqlUsername'), 'password' => array_get($input, 'mysqlPassword'), - 'prefix' => '', + 'prefix' => array_get($input, 'tablePrefix'), ]); $data->setAdminUser([ diff --git a/views/install/install.php b/views/install/install.php index 582286427..0e3e2a828 100644 --- a/views/install/install.php +++ b/views/install/install.php @@ -32,6 +32,11 @@ + +
+ + +