From: Dolf Schimmel <dolfschimmel@gmail.com>
Date: Wed, 13 Jun 2012 16:46:12 +0000 (-0700)
Subject: Merge pull request #70 from EvanDotPro/feature/zf2-path-env
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=d5f0f3216084687f5224e2b4c2768fefca628500;hp=a530a988873f4c5d6eb7bf36601b9a42d3908428;p=zf2.biz%2Fgalerie.git

Merge pull request #70 from EvanDotPro/feature/zf2-path-env

Add conditional check for allowing ZF2_PATH env variable to be used
---

diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index 13643b9..a52739c 100644
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -40,10 +40,10 @@ return array(
         'not_found_template'       => 'error/404',
         'exception_template'       => 'error/index',
         'template_map' => array(
-            'layout/layout' => __DIR__ . '/../view/layout/layout.phtml',
-            'index/index'   => __DIR__ . '/../view/index/index.phtml',
-            'error/404'     => __DIR__ . '/../view/error/404.phtml',
-            'error/index'   => __DIR__ . '/../view/error/index.phtml',
+            'layout/layout'           => __DIR__ . '/../view/layout/layout.phtml',
+            'application/index/index' => __DIR__ . '/../view/application/index/index.phtml',
+            'error/404'               => __DIR__ . '/../view/error/404.phtml',
+            'error/index'             => __DIR__ . '/../view/error/index.phtml',
         ),
         'template_path_stack' => array(
             __DIR__ . '/../view',