Commit dcc2a54e authored by jwage's avatar jwage

Reversed r3840. Broke tests.

parent d5b8a6a7
...@@ -157,9 +157,9 @@ END; ...@@ -157,9 +157,9 @@ END;
{ {
if ($modelsPath) { if ($modelsPath) {
$models = Doctrine::loadModels($modelsPath); $models = Doctrine::loadModels($modelsPath);
} } else {
$models = Doctrine::getLoadedModels(); $models = Doctrine::getLoadedModels();
}
$foreignKeys = array(); $foreignKeys = array();
......
...@@ -1047,9 +1047,9 @@ class Doctrine_Export extends Doctrine_Connection_Module ...@@ -1047,9 +1047,9 @@ class Doctrine_Export extends Doctrine_Connection_Module
{ {
if ($directory !== null) { if ($directory !== null) {
$models = Doctrine::loadModels($directory); $models = Doctrine::loadModels($directory);
} } else {
$models = Doctrine::getLoadedModels(); $models = Doctrine::getLoadedModels();
}
$this->exportClasses($models); $this->exportClasses($models);
} }
......
...@@ -45,10 +45,10 @@ class Doctrine_Export_Schema ...@@ -45,10 +45,10 @@ class Doctrine_Export_Schema
public function buildSchema($directory = null, $models = array()) public function buildSchema($directory = null, $models = array())
{ {
if ($directory) { if ($directory) {
Doctrine::loadModels($directory); $loadedModels = Doctrine::loadModels($directory);
} } else {
$loadedModels = Doctrine::getLoadedModels(); $loadedModels = Doctrine::getLoadedModels();
}
$array = array(); $array = array();
......
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