Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 5a42749

Browse files
author
Jamie Snape
committed
Fix strange database issue with tests
1 parent 7515950 commit 5a42749

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

core/controllers/components/UtilityComponent.php

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -444,24 +444,7 @@ public function installModule($moduleName)
444444

445445
try {
446446
$configDatabase = Zend_Registry::get('configDatabase');
447-
if (empty($configDatabase->database->params->driver_options)) {
448-
$driverOptions = array();
449-
} else {
450-
$driverOptions = $configDatabase->database->params->driver_options->toArray();
451-
}
452-
$params = array(
453-
'dbname' => $configDatabase->database->params->dbname,
454-
'username' => $configDatabase->database->params->username,
455-
'password' => $configDatabase->database->params->password,
456-
'driver_options' => $driverOptions,
457-
);
458-
if (empty($configDatabase->database->params->unix_socket)) {
459-
$params['host'] = $configDatabase->database->params->host;
460-
$params['port'] = $configDatabase->database->params->port;
461-
} else {
462-
$params['unix_socket'] = $configDatabase->database->params->unix_socket;
463-
}
464-
$db = Zend_Db::factory($configDatabase->database->adapter, $params);
447+
$db = Zend_Registry::get('dbAdapter');
465448

466449
switch ($configDatabase->database->adapter) {
467450
case 'PDO_MYSQL':

0 commit comments

Comments
 (0)