ObjectRegistry should use aliased class name for missing class exception

cakephp · Jun 13, 2014 · 85e5b37 · 85e5b37
1 parent 1f7d91c
commit 85e5b37
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/Utility/ObjectRegistry.php b/src/Utility/ObjectRegistry.php
@@ -69,13 +69,12 @@ public function load($objectName, $config = []) {
 			return $this->_loaded[$name];
 		}
 		if (is_array($config) && isset($config['className'])) {
-			$className = $this->_resolveClassName($config['className']);
-		}
-		if (!isset($className)) {
-			$className = $this->_resolveClassName($objectName);
+			$objectName = $config['className'];
 		}
+		$className = $this->_resolveClassName($objectName);
 		if (!$className) {
-			$this->_throwMissingClassError($objectName, substr($plugin, 0, -1));
+			list($plugin, $objectName) = pluginSplit($objectName);
+			$this->_throwMissingClassError($objectName, $plugin);
 		}
 		$instance = $this->_create($className, $name, $config);
 		$this->_loaded[$name] = $instance;