From 800961fc974cc88c807d8cca0e44e2961713dd60 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Fri, 1 Jun 2007 23:04:41 +0000
Subject: [PATCH] Adding changes to Controller::set() to force $camelBacked
 variables only if second params is null

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5231 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/controller/controller.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 92fd62d5a..418fd48ed 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -535,7 +535,11 @@ class Controller extends Object {
 			if ($name == 'title') {
 				$this->pageTitle = $value;
 			} else {
-				$this->viewVars[Inflector::variable($name)] = $value;
+				if($two === null) {
+					$this->viewVars[Inflector::variable($name)] = $value;
+				} else {
+					$this->viewVars[$name] = $value;
+				}
 			}
 		}
 	}