1
0
Fork 0

Continued to switch the old configuration handling to the new one.

Dieser Commit ist enthalten in:
DSB 2012-08-04 17:09:48 +00:00
Ursprung 025b5c339d
Commit ae87af916f
54 geänderte Dateien mit 501 neuen und 269 gelöschten Zeilen

Datei anzeigen

@ -53,15 +53,15 @@ class Msd_View_Helper_Menu extends Zend_View_Helper_Abstract
*/
private function _getDatabases()
{
$actualDb = $this->view->config->get('dynamic.dbActual');
$databases = $this->view->config->get('dynamic.databases');
$actualDb = $this->view->dynamicConfig->getParam('dbActual');
$databases = $this->view->dynamicConfig->getParam('databases', array());
$dbo = Msd_Db::getAdapter();
if (empty($databases) || $dbo->selectDb($actualDb) !== true) {
// couldn't connect to db - refresh db-list
$databases = $dbo->getDatabaseNames();
// if database was deleted or is not accessible by user
// fallback to default db
$defaultDb = $this->view->config->get('config.dbuser.defaultDb');
$defaultDb = $this->view->config->getParam('dbuser.defaultDb');
if ($defaultDb != '') {
$actualDb = $defaultDb;
if ($dbo->selectDb($actualDb) !== true) {
@ -70,8 +70,8 @@ class Msd_View_Helper_Menu extends Zend_View_Helper_Abstract
$dbo->selectDb($actualDb);
}
}
$this->view->config->set('dynamic.dbActual', $actualDb);
$this->view->config->set('dynamic.databases', $databases);
$this->view->dynamicConfig->setParam('dbActual', $actualDb);
$this->view->dynamicConfig->setParam('databases', $databases);
}
return $databases;
}