Don't overwrite properties when they are set.

If modelClass or modelKey is set the framework should not overwrite them.
cakephp · Dec 7, 2013 · 14a6e01 · 14a6e01
1 parent 5a58c8c
commit 14a6e01
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/Cake/Test/TestCase/Controller/ControllerTest.php b/Cake/Test/TestCase/Controller/ControllerTest.php
@@ -533,7 +533,11 @@ public function testMergeVars() {
 		$TestController = new AnotherTestController($request);
 		$TestController->constructClasses();
 
-		$this->assertEquals('AnotherTest', $TestController->modelClass);
+		$this->assertEquals(
+			'Post',
+			$TestController->modelClass,
+			'modelClass should not be overwritten when defined.'
+		);
 	}
 
 /**

diff --git a/Cake/Utility/RepositoryAwareTrait.php b/Cake/Utility/RepositoryAwareTrait.php
@@ -48,11 +48,18 @@ trait RepositoryAwareTrait {
 /**
  * Set the modelClass and modelKey properties based on conventions.
  *
- * If the properties are already set they w
+ * If the properties are already set they will not be overwritten
+ *
+ * @param string $name
+ * @return void
  */
 	protected function _setModelClass($name) {
-		$this->modelClass = Inflector::singularize($this->name);
-		$this->modelKey = Inflector::underscore($this->modelClass);
+		if (empty($this->modelClass)) {
+			$this->modelClass = Inflector::singularize($this->name);
+		}
+		if (empty($this->modelKey)) {
+			$this->modelKey = Inflector::underscore($this->modelClass);
+		}
 	}
 /**
  * Loads and constructs repository objects required by this object