Merge pull request #4930 from jrbasso/2.6-not-executed

Removed the code that was never being executed
This commit is contained in:
Mark Story 2014-10-19 20:40:58 -04:00
commit 6b723b9327

View file

@ -181,15 +181,9 @@ class ClassRegistry {
} elseif ($plugin && class_exists($plugin . 'AppModel')) {
$appModel = $plugin . 'AppModel';
}
if (!empty($appModel)) {
$settings['name'] = $class;
$instance = new $appModel($settings);
}
if (!isset($instance)) {
trigger_error(__d('cake_dev', '(ClassRegistry::init() could not create instance of %s', $class), E_USER_WARNING);
return false;
}
$settings['name'] = $class;
$instance = new $appModel($settings);
}
$_this->map($alias, $class);
}