Sun Nov  5 22:33:06 PHT 2006  Nimrod A. Abing <nimrod.abing@gmail.com>
  * Resolve conflicts introduced in CakePHP-v-1.1.10.3825.
diff -rN -u old-cake/cake/libs/error.php new-cake/cake/libs/error.php
--- old-cake/cake/libs/error.php	2006-11-05 22:35:45.000000000 +0800
+++ new-cake/cake/libs/error.php	2006-11-05 22:35: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);
diff -rN -u old-cake/cake/libs/model/model_php4.php new-cake/cake/libs/model/model_php4.php
--- old-cake/cake/libs/model/model_php4.php	2006-11-05 22:35:45.000000000 +0800
+++ new-cake/cake/libs/model/model_php4.php	2006-11-05 22:35:45.000000000 +0800
@@ -458,7 +458,11 @@
 			$this->{$assoc} =& ClassRegistry::getObject($colKey);
 			$this->{$className} =& $this->{$assoc};
 		} else {
-			$this->{$className} =& new $className();
+			if (!class_exists($className)) {
+				lazyLoadModel($className);
+			}
+			$this->{$assoc} =& new $className();
+			$this->{$className} =& $this->{$assoc};
 		}
 
 		$this->alias[$assoc] = $this->{$assoc}->table;
diff -rN -u old-cake/cake/libs/model/model_php5.php new-cake/cake/libs/model/model_php5.php
--- old-cake/cake/libs/model/model_php5.php	2006-11-05 22:35:45.000000000 +0800
+++ new-cake/cake/libs/model/model_php5.php	2006-11-05 22:35:45.000000000 +0800
@@ -452,7 +452,11 @@
 			$this->{$assoc} = ClassRegistry::getObject($colKey);
 			$this->{$className} = $this->{$assoc};
 		} else {
-			$this->{$className} = new $className();
+			if (!class_exists($className)) {
+				lazyLoadModel($className);
+			}
+			$this->{$assoc} = new $className();
+			$this->{$className} = $this->{$assoc};
 		}
 
 		$this->alias[$assoc] = $this->{$assoc}->table;