projects / zf2.biz / galerie.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1b77747)
Update to use new view convenience API
authorEvan Coury <me@evancoury.com>
Sat, 1 Oct 2011 04:22:27 +0000 (21:22 -0700)
committerEvan Coury <me@evancoury.com>
Sat, 1 Oct 2011 04:22:27 +0000 (21:22 -0700)
library/ZendFramework patch | blob | history
modules/Application/views/error/index.phtml patch | blob | history
modules/Application/views/layouts/layout.phtml patch | blob | history

diff --git a/library/ZendFramework b/library/ZendFramework
index 795d6ae..7d314f2 160000 (submodule)
--- a/library/ZendFramework
+++ b/library/ZendFramework
@@ -1 +1 @@
-Subproject commit 795d6aeeb3694d17cf151ad0c7a9b9af8382144f
+Subproject commit 7d314f2eac0f9af3998318f23c423aa2771f668d
diff --git a/modules/Application/views/error/index.phtml b/modules/Application/views/error/index.phtml
index 696917d..454b615 100644 (file)
--- a/modules/Application/views/error/index.phtml
+++ b/modules/Application/views/error/index.phtml
@@ -1,14 +1,14 @@
 <h1>An error occurred</h1>
-<h2><?php echo $this->vars('message') ?></h2>
+<h2><?php echo $this->message ?></h2>
 
-<?php if (isset($this->vars()->exception)): ?>
+<?php if (isset($this->exception)): ?>
 
 <h3>Exception information:</h3>
 <p>
-    <b>Message:</b> <?php echo $this->vars('exception')->getMessage() ?>
+    <b>Message:</b> <?php echo $this->exception->getMessage() ?>
 </p>
 
 <h3>Stack trace:</h3>
-<pre><?php echo $this->vars('exception')->getTraceAsString() ?></pre>
+<pre><?php echo $this->exception->getTraceAsString() ?></pre>
 
 <?php endif ?>
diff --git a/modules/Application/views/layouts/layout.phtml b/modules/Application/views/layouts/layout.phtml
index 6e80807..3527273 100644 (file)
--- a/modules/Application/views/layouts/layout.phtml
+++ b/modules/Application/views/layouts/layout.phtml
@@ -1,12 +1,12 @@
-<?php echo $this->plugin('doctype') ?>
+<?php echo $this->doctype() ?>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <?php echo $this->plugin('headTitle') ?>
+    <?php echo $this->headTitle() ?>
 
 </head>
 <body>
-<?php echo $this->vars()->getRawValue('content'); ?>
+<?php echo $this->raw('content'); ?>
 </body>
 </html>
ZF2, éditions ENI : Galerie.