Changing View::element() to not overwrite viewVars with helpers that

have the same name.
Test added.
Fixes #1354

cake/libs/view/view.php

@@ -381,8 +381,13 @@ class View extends Object {
 		}
 
 		if (is_file($file)) {
-			$params = array_merge_recursive($params, $this->loaded);
+			$vars = array_merge($this->viewVars, $params);
-			$element = $this->_render($file, array_merge($this->viewVars, $params), $loadHelpers);
+			foreach ($this->loaded as $name => $helper) {
+				if (!isset($vars[$name])) {
+					$vars[$name] =& $this->loaded[$name];
+				}
+			}
+			$element = $this->_render($file, $vars, $loadHelpers);
 			if (isset($params['cache']) && isset($cacheFile) && isset($expires)) {
 				cache('views' . DS . $cacheFile, $element, $expires);
 			}

cake/tests/cases/libs/view/view.test.php

@@ -487,6 +487,24 @@ class ViewTest extends CakeTestCase {
 		$this->assertPattern('/non_existant_element/', $result);
 	}
 
+/**
+ * test that additional element viewVars don't get overwritten with helpers.
+ *
+ * @return void
+ */
+	function testElementParamsDontOverwriteHelpers() {
+		$Controller = new ViewPostsController();
+		$Controller->helpers = array('Form');
+
+		$View = new View($Controller);
+		$result = $View->element('type_check', array('form' => 'string'), true);
+		$this->assertEqual('string', $result);
+
+		$View->set('form', 'string');
+		$result = $View->element('type_check', array(), true);
+		$this->assertEqual('string', $result);
+	}
+
 /**
  * testElementCacheHelperNoCache method
  *

cake/tests/test_app/views/elements/type_check.ctp

@@ -0,0 +1 @@
+<?php echo gettype($form); ?>