Browse files

Merge branch 'master' of git://github.com/zendframework/zf2

  • Loading branch information...
2 parents 70492e4 + e7b71e3 commit 9cb3a2d1704694778baf8322df7e4fa85dae55f3 @sgehrig sgehrig committed Dec 2, 2010
View
10 library/Zend/Tool/Project/Context/Zf/ControllerFile.php
@@ -149,26 +149,26 @@ public function getContents()
// 404 error -- controller or action not found
$this->getResponse()->setHttpResponseCode(404);
- $this->view->message = 'Page not found';
+ $this->view->vars()->message = 'Page not found';
break;
default:
// application error
$this->getResponse()->setHttpResponseCode(500);
- $this->view->message = 'Application error';
+ $this->view->vars()->message = 'Application error';
break;
}
// Log exception, if logger available
if (($log = $this->getLog())) {
- $log->crit($this->view->message, $errors->exception);
+ $log->crit($this->view->vars()->message, $errors->exception);
}
// conditionally display exceptions
if ($this->getInvokeArg('displayExceptions') == true) {
- $this->view->exception = $errors->exception;
+ $this->view->vars()->exception = $errors->exception;
}
-$this->view->request = $errors->request;
+$this->view->vars()->request = $errors->request;
EOS
)),
new Php\PhpMethod(array(
View
2 library/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php
@@ -102,7 +102,7 @@ public function getPersistentAttributes()
public function getContents()
{
$contents = <<<'EOS'
-<?php echo $this->layout()->content; ?>
+<?php echo $this->broker('layout')->getLayout()->content; ?>
EOS;
View
10 library/Zend/Tool/Project/Context/Zf/ViewScriptFile.php
@@ -128,21 +128,21 @@ public function getContents()
</head>
<body>
<h1>An error occurred</h1>
- <h2><?php echo $this->message ?></h2>
+ <h2><?php echo $this->vars('message') ?></h2>
- <?php if (isset($this->exception)): ?>
+ <?php if ($this->vars('exception')): ?>
<h3>Exception information:</h3>
<p>
- <b>Message:</b> <?php echo $this->exception->getMessage() ?>
+ <b>Message:</b> <?php echo $this->vars('exception')->getMessage() ?>
</p>
<h3>Stack trace:</h3>
- <pre><?php echo $this->exception->getTraceAsString() ?>
+ <pre><?php echo $this->vars('exception')->getTraceAsString() ?>
</pre>
<h3>Request Parameters:</h3>
- <pre><?php echo var_export($this->request->getParams(), true) ?>
+ <pre><?php echo var_export($this->vars('request')->getParams(), true) ?>
</pre>
<?php endif ?>

0 comments on commit 9cb3a2d

Please sign in to comment.