Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading

lib/Cake/View/View.php

@@ -680,7 +680,7 @@ class View extends Object {
 		}
 
 		if ($name === null) {
-			$name = $this->action;
+			$name = $this->view;
 		}
 		$name = str_replace('/', DS, $name);
 

lib/Cake/tests/cases/libs/view/view.test.php

@@ -706,6 +706,20 @@ class ViewTest extends CakeTestCase {
 	}
 
 /**
+ * test that View::$view works
+ *
+ * @return void
+ */
+	function testRenderUsingViewProperty() {
+		$this->PostsController->view = 'cache_form';
+		$View = new TestView($this->PostsController);
+		
+		$this->assertEquals('cache_form', $View->view);
+		$result = $View->render();
+		$this->assertRegExp('/Add User/', $result);
+	}
+
+/**
  * test that view vars can replace the local helper variables
  * and not overwrite the $this->Helper references
  *