From 84fb1ecdc47924062aef6cca5dab66de29666732 Mon Sep 17 00:00:00 2001 From: "Jonathan.Wage" Date: Thu, 8 Nov 2007 23:49:01 +0000 Subject: [PATCH] Fix array_merge so that schemas that are loaded after are merged in to the existing array of schemas. --- lib/Doctrine/Import/Schema.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/Import/Schema.php b/lib/Doctrine/Import/Schema.php index 6a26a2bac..7a7d6a8e2 100644 --- a/lib/Doctrine/Import/Schema.php +++ b/lib/Doctrine/Import/Schema.php @@ -103,7 +103,7 @@ class Doctrine_Import_Schema foreach ((array) $schema AS $s) { if (is_file($s)) { - $array = array_merge($this->parseSchema($s, $format), $array); + $array = array_merge($array, $this->parseSchema($s, $format)); } else if (is_dir($s)) { $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($s), RecursiveIteratorIterator::LEAVES_ONLY); @@ -111,7 +111,7 @@ class Doctrine_Import_Schema foreach ($it as $file) { $e = explode('.', $file->getFileName()); if (end($e) === $format) { - $array = array_merge($this->parseSchema($file->getPathName(), $format), $array); + $array = array_merge($array, $this->parseSchema($file->getPathName(), $format)); } } }