Fix issue where including elements + extending views fails.

If you include an element before calling extend(), the parent view
will be assumed to be an element instead of a view/layout.

Fixes #3248

lib/Cake/Test/Case/View/ViewTest.php

@@ -1397,6 +1397,22 @@ public function testExtendMissingElement() {
 		$this->View->render('extend_missing_element');
 	}
 
+/**
+ * Test extend() preceeded by an element()
+ *
+ * @return void
+ */
+	public function testExtendWithElementBeforeExtend() {
+		$this->View->layout = false;
+		$result = $this->View->render('extend_with_element');
+		$expected = <<<TEXT
+Parent View.
+this is the test elementThe view
+
+TEXT;
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * Test that setting arbitrary properties still works.
  *

lib/Cake/Test/test_app/View/Posts/extend_with_element.ctp

@@ -0,0 +1,3 @@
+<?php echo $this->element('test_element'); ?>
+<?php $this->extend('parent_view'); ?>
+The view

lib/Cake/View/View.php

@@ -415,9 +415,15 @@ public function element($name, $data = array(), $options = array()) {
 				$this->getEventManager()->dispatch(new CakeEvent('View.beforeRender', $this, array($file)));
 			}
 
+			$current = $this->_current;
+			$restore = $this->_currentType;
+
 			$this->_currentType = self::TYPE_ELEMENT;
 			$element = $this->_render($file, array_merge($this->viewVars, $data));
 
+			$this->_currentType = $restore;
+			$this->_current = $current;
+
 			if ($callbacks) {
 				$this->getEventManager()->dispatch(new CakeEvent('View.afterRender', $this, array($file, $element)));
 			}