Wed Sep 13 10:14:55 PHT 2006  Nimrod A. Abing <nimrod.abing@gmail.com>
  * Resolve conflicts introduced in CakePHP-v-1.1.7.3454.
diff -rN -u old-cake/cake/libs/error.php new-cake/cake/libs/error.php
--- old-cake/cake/libs/error.php	2006-09-13 10:17:05.000000000 +0800
+++ new-cake/cake/libs/error.php	2006-09-13 10:17:05.000000000 +0800
@@ -48,7 +48,10 @@
 	function __construct($method, $messages) {
 		parent::__construct();
 		static $__previousError = null;
-		$this->__dispatch =& new Dispatcher();
+		$clean = new Sanitize();
+		$messages = $clean->paranoid($messages, array('.', '/', '_'));
+		$dispatcherClass = getDispatcherClass();
+		$this->__dispatch =& new $dispatcherClass();
 
 		if ($__previousError != array($method, $messages)) {
 			$__previousError = array($method, $messages);