Removing variable name inflection from Controller::set()

cakephp · Jan 20, 2009 · c7d133f · c7d133f
1 parent 5a7dc39
commit c7d133f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
@@ -641,11 +641,7 @@ function set($one, $two = null) {
 			if ($name === 'title') {
 				$this->pageTitle = $value;
 			} else {
-				if ($two === null && is_array($one)) {
-					$this->viewVars[Inflector::variable($name)] = $value;
-				} else {
-					$this->viewVars[$name] = $value;
-				}
+				$this->viewVars[$name] = $value;
 			}
 		}
 	}

diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
@@ -657,7 +657,7 @@ function testControllerSet() {
 		$Controller->viewVars = array();
 		$viewVars = array('ModelName' => array('id' => 1, 'name' => 'value'));
 		$Controller->set($viewVars);
-		$this->assertTrue(array_key_exists('modelName', $Controller->viewVars));
+		$this->assertTrue(array_key_exists('ModelName', $Controller->viewVars));
 
 		$Controller->viewVars = array();
 		$Controller->set('variable_with_underscores', 'value');
@@ -666,7 +666,7 @@ function testControllerSet() {
 		$Controller->viewVars = array();
 		$viewVars = array('ModelName' => 'name');
 		$Controller->set($viewVars);
-		$this->assertTrue(array_key_exists('modelName', $Controller->viewVars));
+		$this->assertTrue(array_key_exists('ModelName', $Controller->viewVars));
 
 		$Controller->set('title', 'someTitle');
 		$this->assertIdentical($Controller->pageTitle, 'someTitle');