adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moving the first database driver to the correct folder to start testing

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-12-04 11:52:23 -04:30
parent 8678661b9c
commit be1263d476
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Cake/Model/ConnectionManager.php
View file

@ -165,14 +165,11 @@ class ConnectionManager {
return false; return false;
} }
if (!empty($conn['parent'])) {
$_this->loadDataSource($conn['parent']);
}
$conn = array_merge(array('plugin' => null, 'classname' => null, 'parent' => null), $conn); $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); trigger_error(sprintf(__('ConnectionManager::loadDataSource - Unable to import DataSource class %s'), $class), E_USER_ERROR);
return null; return null;
} }

0
cake/libs/model/datasources/dbo/dbo_mysql.php → lib/Cake/Model/Datasource/Database/Mysql.php
View file