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

@ -16,8 +16,7 @@
* @package MySQLDumper
* @subpackage Action_Helper
*/
class Msd_Action_Helper_AssignConfigAndLanguage
extends Zend_Controller_Action_Helper_Abstract
class Msd_Action_Helper_AssignConfigAndLanguage extends Zend_Controller_Action_Helper_Abstract
{
/**
* Actual Zend_View instance
@ -36,9 +35,10 @@ class Msd_Action_Helper_AssignConfigAndLanguage
if ($controllerName == 'install') {
return;
}
$view = $this->getView();
$view->config = Msd_Configuration::getInstance();
$view->lang = Msd_Language::getInstance();
$view = $this->getView();
$view->config = Msd_Registry::getConfig();
$view->dynamicConfig = Msd_Registry::getDynamicConfig();
$view->lang = Msd_Language::getInstance();
}
/**
@ -51,7 +51,7 @@ class Msd_Action_Helper_AssignConfigAndLanguage
if (null !== $this->_view) {
return $this->_view;
} else {
$controller = $this->getActionController();
$controller = $this->getActionController();
$this->_view = $controller->view;
return $this->_view;
}