Merge pull request kohana#81 from shadlaws/3.3/develop

Change _initialize() to set the object name only if none predefined. Fixes #4733
tmihalik · May 2, 2013 · 9273028 · 9273028
2 parents 7a19687 + aebe3ab
commit 9273028
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/classes/Kohana/ORM.php b/classes/Kohana/ORM.php
@@ -288,8 +288,11 @@ public function __construct($id = NULL)
 	 */
 	protected function _initialize()
 	{
-		// Set the object name and plural name
-		$this->_object_name = strtolower(substr(get_class($this), 6));
+		// Set the object name if none predefined
+		if (empty($this->_object_name))
+		{
+			$this->_object_name = strtolower(substr(get_class($this), 6));
+		}
 
 		// Check if this model has already been initialized
 		if ( ! $init = Arr::get(ORM::$_init_cache, $this->_object_name, FALSE))