Avoid unnecessary calls to ConnectionManager::enumConnectionObjects()…

… in ClassRegistry::init(). Closes #3724
cakephp · Mar 27, 2013 · 733116d · 733116d
1 parent 342bf65
commit 733116d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/Cake/Utility/ClassRegistry.php b/lib/Cake/Utility/ClassRegistry.php
@@ -109,7 +109,7 @@ public static function init($class, $strict = false) {
 			$defaults = $_this->_config['Model'];
 		}
 		$count = count($objects);
-		$availableDs = array_keys(ConnectionManager::enumConnectionObjects());
+		$availableDs = null;
 
 		foreach ($objects as $settings) {
 			if (is_numeric($settings)) {
@@ -153,6 +153,9 @@ public static function init($class, $strict = false) {
 						$defaultProperties = $reflection->getDefaultProperties();
 						if (isset($defaultProperties['useDbConfig'])) {
 							$useDbConfig = $defaultProperties['useDbConfig'];
+							if ($availableDs === null) {
+								$availableDs = array_keys(ConnectionManager::enumConnectionObjects());
+							}
 							if (in_array('test_' . $useDbConfig, $availableDs)) {
 								$useDbConfig = 'test_' . $useDbConfig;
 							}