Updating ConnectionManager with new DataSource paths

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3094 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-06-14 22:49:42 +00:00
parent 0801dce999
commit 0def58fa67

View file

@ -39,7 +39,7 @@
uses ('model' . DS . 'datasources' . DS . 'datasource');
class ConnectionManager extends Object{
class ConnectionManager extends Object {
/**
* Holds a loaded instance of the Connections object
@ -145,10 +145,10 @@ class ConnectionManager extends Object{
return false;
}
if (fileExistsInPath(LIBS . 'model' . DS . $conn['filename'] . '.php')) {
require (LIBS . 'model' . DS . $conn['filename'] . '.php');
} else if(file_exists(MODELS . $conn['filename'] . '.php')) {
require (MODELS . 'datasources' . DS . $conn['filename'] . '.php');
if (fileExistsInPath(LIBS . 'model' . DS . 'datasources' . DS . $conn['filename'] . '.php')) {
require (LIBS . 'model' . DS . 'datasources' . DS . $conn['filename'] . '.php');
} else if(file_exists(MODELS . 'datasources' . DS . $conn['filename'] . '.php')) {
require (MODELS . 'datasources' . DS . 'datasources' . DS . $conn['filename'] . '.php');
} else {
trigger_error('Unable to load DataSource file ' . $conn['filename'] . '.php', E_USER_ERROR);
return null;
@ -191,4 +191,5 @@ class ConnectionManager extends Object{
}
}
}
?>