Skip to content

Commit ca23387

Browse files
committed
* [FIX] Fixed issue when installing sysPass. Database connection data was not updated.
1 parent 8a7a51e commit ca23387

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

app/modules/web/Controllers/BootstrapController.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ final class BootstrapController extends SimpleControllerBase
4343
/**
4444
* Returns environment data
4545
*
46-
* @throws \SP\Core\Exceptions\FileNotFoundException
4746
* @throws \SP\Core\Exceptions\SPException
4847
*/
4948
public function getEnvironmentAction()
@@ -89,13 +88,13 @@ private function getCookiesEnabled()
8988

9089
/**
9190
* @return array
92-
* @throws \SP\Core\Exceptions\ConstraintException
93-
* @throws \SP\Core\Exceptions\QueryException
9491
*/
9592
private function getPlugins()
9693
{
97-
if ($this->configData->isInstalled()) {
94+
try {
9895
return $this->dic->get(PluginManager::class)->getEnabledPlugins();
96+
} catch (\Exception $e) {
97+
processException($e);
9998
}
10099

101100
return [];

build/.blank

Whitespace-only changes.

lib/SP/Services/Install/Installer.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
use SP\Config\ConfigData;
2929
use SP\Core\Crypt\Hash;
30+
use SP\Core\Events\EventDispatcher;
3031
use SP\Core\Exceptions\InvalidArgumentException;
3132
use SP\Core\Exceptions\SPException;
3233
use SP\DataModel\ProfileData;
@@ -39,6 +40,7 @@
3940
use SP\Services\User\UserService;
4041
use SP\Services\UserGroup\UserGroupService;
4142
use SP\Services\UserProfile\UserProfileService;
43+
use SP\Storage\Database\Database;
4244
use SP\Storage\Database\DBStorageInterface;
4345
use SP\Util\Util;
4446
use SP\Util\Version;
@@ -55,7 +57,7 @@ final class Installer extends Service
5557
*/
5658
const VERSION = [3, 0, 0];
5759
const VERSION_TEXT = '3.0-beta';
58-
const BUILD = 18080903;
60+
const BUILD = 18081001;
5961

6062
/**
6163
* @var DatabaseSetupInterface
@@ -287,6 +289,7 @@ private function setupDb($type = 'mysql')
287289
private function updateConnectionData()
288290
{
289291
$this->dic->set(DBStorageInterface::class, $this->dbs->createDbHandlerFromInstaller());
292+
$this->dic->set(Database::class, new Database($this->dic->get(DBStorageInterface::class), $this->dic->get(EventDispatcher::class)));
290293
}
291294

292295
/**

0 commit comments

Comments
 (0)