From 49440e70a33225e071345bf53d8a7471d3997670 Mon Sep 17 00:00:00 2001 From: Evan Coury Date: Sun, 2 Oct 2011 07:07:01 -0700 Subject: [PATCH] More verybose name for module manager options in config and updated URL helper with Matthew's latest --- configs/application.config.php | 2 +- modules/Application/src/Application/View/Helper/Url.php | 2 +- public/index.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/application.config.php b/configs/application.config.php index b093106..90da2e6 100644 --- a/configs/application.config.php +++ b/configs/application.config.php @@ -6,7 +6,7 @@ return new Zend\Config\Config(array( 'modules' => array( 'Application', ), - 'module_config' => array( + 'module_manager_options' => array( 'cache_config' => false, 'cache_dir' => realpath(__DIR__ . '/../data/cache'), ), diff --git a/modules/Application/src/Application/View/Helper/Url.php b/modules/Application/src/Application/View/Helper/Url.php index ccea1fe..3785c47 100644 --- a/modules/Application/src/Application/View/Helper/Url.php +++ b/modules/Application/src/Application/View/Helper/Url.php @@ -13,7 +13,7 @@ class Url extends AbstractHelper $this->router = $router; } - public function direct($params = array(), $options = array()) + public function __invoke($params = array(), $options = array()) { if (null === $this->router) { return ''; diff --git a/public/index.php b/public/index.php index f4bf164..f56f4a6 100644 --- a/public/index.php +++ b/public/index.php @@ -19,7 +19,7 @@ $moduleLoader->register(); $moduleManager = new Zend\Module\Manager( $appConfig->modules, - new Zend\Module\ManagerOptions($appConfig->module_config) + new Zend\Module\ManagerOptions($appConfig->module_manager_options) ); // Get the merged config object -- 1.7.10.4