Moving core view to the new folder and allowing the view class to fin…

…d those views

lib/Cake/Core/App.php

@@ -330,7 +330,7 @@ public static function core($type = null) {
 		static $paths = false;
 		if (!$paths) {
 			$paths = array();
-			$libs = dirname(__FILE__) . DS;
+			$libs = LIBS;
 			$cake = dirname($libs) . DS;
 			$path = dirname($cake) . DS;
 
@@ -341,7 +341,7 @@ public static function core($type = null) {
 			$paths['behaviors'][] = $libs . 'model' . DS . 'behaviors' . DS;
 			$paths['controllers'][] = $libs . 'controller' . DS;
 			$paths['components'][] = $libs . 'controller' . DS . 'components' . DS;
-			$paths['views'][] = $libs . 'view' . DS;
+			$paths['views'][] = $libs . 'View' . DS;
 			$paths['helpers'][] = $libs . 'view' . DS . 'helpers' . DS;
 			$paths['plugins'][] = $path . 'plugins' . DS;
 			$paths['vendors'][] = $path . 'vendors' . DS;

lib/Cake/Utility/ClassRegistry.php

@@ -140,11 +140,11 @@ public static function &init($class, $type = null) {
 				if (class_exists($class)) {
 					${$class} = new $class($settings);
 				} elseif ($type === 'Model') {
-					//if ($plugin && class_exists($plugin . 'AppModel')) {
-					//	$appModel = $plugin . 'AppModel';
-					//} else {
+					if ($plugin && class_exists($plugin . 'AppModel')) {
+						$appModel = $plugin . 'AppModel';
+					} else {
 						$appModel = 'AppModel';
-					//}
+					}
 					$settings['name'] = $class;
 					${$class} = new $appModel($settings);
 				}

lib/Cake/View/View.php

@@ -811,7 +811,8 @@ protected function _paths($plugin = null, $cached = true) {
 			}
 			$paths[] = App::pluginPath($plugin) . 'views' . DS;
 		}
-		$this->__paths = array_merge($paths, $viewPaths);
+
+		$this->__paths = array_merge($paths, $viewPaths, array_flip($corePaths));
 		return $this->__paths;
 	}
 }