Fri Dec 29 01:30:27 PHT 2006  Nimrod A. Abing <nimrod.abing@gmail.com>
  * Resolve conflicts introduced in CakePHP-v-1.1.12.4205.
diff -rN -u old-cake/cake/libs/error.php new-cake/cake/libs/error.php
--- old-cake/cake/libs/error.php	2006-12-29 01:31:45.000000000 +0800
+++ new-cake/cake/libs/error.php	2006-12-29 01:31:45.000000000 +0800
@@ -48,7 +48,15 @@
 	function __construct($method, $messages) {
 		parent::__construct();
 		static $__previousError = null;
-		$this->__dispatch =& new Dispatcher();
+
+		$allow = array('.', '/', '_', ' ', '-', '~');
+		if(substr(PHP_OS,0,3) == "WIN") {
+			$allow = array_merge($allow, array('\\', ':') );
+		}
+		$clean = new Sanitize();
+		$messages = $clean->paranoid($messages, array('.', '/', '_'));
+		$dispatcherClass = getDispatcherClass();
+		$this->__dispatch =& new $dispatcherClass();
 
 		if ($__previousError != array($method, $messages)) {
 			$__previousError = array($method, $messages);
@@ -347,4 +355,4 @@
 		return $this->__dispatch->webroot;
 	}
 }
-?>
\ No newline at end of file
+?>