Commit dcc2a54e authored by jwage's avatar jwage

Reversed r3840. Broke tests.

parent d5b8a6a7
......@@ -157,10 +157,10 @@ END;
{
if ($modelsPath) {
$models = Doctrine::loadModels($modelsPath);
} else {
$models = Doctrine::getLoadedModels();
}
$models = Doctrine::getLoadedModels();
$foreignKeys = array();
foreach ($models as $model) {
......
......@@ -1047,10 +1047,10 @@ class Doctrine_Export extends Doctrine_Connection_Module
{
if ($directory !== null) {
$models = Doctrine::loadModels($directory);
} else {
$models = Doctrine::getLoadedModels();
}
$models = Doctrine::getLoadedModels();
$this->exportClasses($models);
}
......
......@@ -45,11 +45,11 @@ class Doctrine_Export_Schema
public function buildSchema($directory = null, $models = array())
{
if ($directory) {
Doctrine::loadModels($directory);
$loadedModels = Doctrine::loadModels($directory);
} else {
$loadedModels = Doctrine::getLoadedModels();
}
$loadedModels = Doctrine::getLoadedModels();
$array = array();
$parent = new ReflectionClass('Doctrine_Record');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment