mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Moving the first database driver to the correct folder to start testing
This commit is contained in:
parent
8678661b9c
commit
be1263d476
2 changed files with 3 additions and 6 deletions
|
@ -165,14 +165,11 @@ class ConnectionManager {
|
|||
return false;
|
||||
}
|
||||
|
||||
if (!empty($conn['parent'])) {
|
||||
$_this->loadDataSource($conn['parent']);
|
||||
}
|
||||
|
||||
$conn = array_merge(array('plugin' => null, 'classname' => null, 'parent' => null), $conn);
|
||||
$class = "{$conn['plugin']}.{$conn['classname']}";
|
||||
$class = trim("{$conn['plugin']}.{$conn['classname']}", '.');
|
||||
|
||||
if (!App::import('Datasource', $class, !is_null($conn['plugin']))) {
|
||||
App::uses($class, 'Model/Datasource');
|
||||
if (class_exists($class)) {
|
||||
trigger_error(sprintf(__('ConnectionManager::loadDataSource - Unable to import DataSource class %s'), $class), E_USER_ERROR);
|
||||
return null;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue