Fix regression caused by PR #6942.

cakephp · Jul 17, 2015 · 9b857d0 · 9b857d0
1 parent 0c09f0d
commit 9b857d0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/Core/ObjectRegistry.php b/src/Core/ObjectRegistry.php
@@ -69,10 +69,11 @@ abstract class ObjectRegistry
      */
     public function load($objectName, $config = [])
     {
-        if (empty($config) && !isset($this->_loaded[$objectName])) {
-            list(, $name) = pluginSplit($objectName);
-        } else {
+        if (is_array($config) && isset($config['className'])) {
             $name = $objectName;
+            $objectName = $config['className'];
+        } else {
+            list(, $name) = pluginSplit($objectName);
         }
 
         $loaded = isset($this->_loaded[$name]);
@@ -83,9 +84,6 @@ public function load($objectName, $config = [])
             return $this->_loaded[$name];
         }
 
-        if (is_array($config) && isset($config['className'])) {
-            $objectName = $config['className'];
-        }
         $className = $this->_resolveClassName($objectName);
         if (!$className || (is_string($className) && !class_exists($className))) {
             list($plugin, $objectName) = pluginSplit($objectName);

diff --git a/tests/TestCase/ORM/BehaviorRegistryTest.php b/tests/TestCase/ORM/BehaviorRegistryTest.php
@@ -110,7 +110,16 @@ public function testLoadPlugin()
     {
         Plugin::load('TestPlugin');
         $result = $this->Behaviors->load('TestPlugin.PersisterOne');
-        $this->assertInstanceOf('TestPlugin\Model\Behavior\PersisterOneBehavior', $result);
+
+        $expected = 'TestPlugin\Model\Behavior\PersisterOneBehavior';
+        $this->assertInstanceOf($expected, $result);
+        $this->assertInstanceOf($expected, $this->Behaviors->PersisterOne);
+
+        $this->Behaviors->unload('PersisterOne');
+
+        $result = $this->Behaviors->load('TestPlugin.PersisterOne', ['foo' => 'bar']);
+        $this->assertInstanceOf($expected, $result);
+        $this->assertInstanceOf($expected, $this->Behaviors->PersisterOne);
     }
 
     /**