Merge remote-tracking branch 'weierophinney/hotfix/beta5-escaper'

diff --git a/module/Application/view/error/404.phtml b/module/Application/view/error/404.phtml
index f3e4eba..58be921 100644 (file)
--- a/module/Application/view/error/404.phtml
+++ b/module/Application/view/error/404.phtml
@@ -32,13 +32,13 @@ switch ($this->reason) {
 
 <dl>
     <dt>Controller:</dt>
-    <dd><?php echo $this->escape($this->controller) ?>
+    <dd><?php echo $this->escapeHtml($this->controller) ?>
 <?php
 if (isset($this->controller_class) 
     && $this->controller_class
     && $this->controller_class != $this->controller
 ) {
-    echo " (resolves to " . $this->escape($this->controller_class) . ")";
+    echo " (resolves to " . $this->escapeHtml($this->controller_class) . ")";
 }
 ?>
 </dd>
@@ -50,7 +50,7 @@ if (isset($this->controller_class)
 
 <h2>Exception:</h2>
 
-<p><b><?php echo $this->escape($this->exception->getMessage()) ?></b></p>
+<p><b><?php echo $this->escapeHtml($this->exception->getMessage()) ?></b></p>
 
 <h3>Stack trace</h3>