From 7ed4665318a49be0a8b8febbc73c68582d3fbb7f Mon Sep 17 00:00:00 2001
From: gwoo <gwoo@cakephp.org>
Date: Sat, 31 May 2008 04:50:38 +0000
Subject: [PATCH] updating error handler and erro404 template. closes #4799

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7073 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/error.php                | 2 +-
 cake/libs/view/errors/error404.ctp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/libs/error.php b/cake/libs/error.php
index 6cb3d7088..c40e15055 100644
--- a/cake/libs/error.php
+++ b/cake/libs/error.php
@@ -125,7 +125,7 @@ class ErrorHandler extends Object {
 		$this->controller->set(array(
 			'code' => '404',
 			'name' => __('Not Found', true),
-			'message' => sprintf(__("The requested address %s was not found on this server.", true), "<strong>'{$url}'</strong>"),
+			'message' => h($url),
 			'base' => $this->controller->base
 		));
 		$this->__outputMessage('error404');
diff --git a/cake/libs/view/errors/error404.ctp b/cake/libs/view/errors/error404.ctp
index 8e375b306..a868ee6ac 100644
--- a/cake/libs/view/errors/error404.ctp
+++ b/cake/libs/view/errors/error404.ctp
@@ -27,5 +27,5 @@
 <h2><?php echo $name; ?></h2>
 <p class="error">
 	<strong><?php __('Error'); ?>: </strong>
-	<?php echo $message; ?>
+	<?php echo sprintf(__("The requested address %s was not found on this server.", true), "<strong>'{$message}'</strong>")?>
 </p>