Merge pull request #40 from glorpen/master

Reverse array merge with user build_properties
This commit is contained in:
William DURAND 2011-09-08 00:50:51 -07:00
commit 2cb15a8424

View file

@ -155,8 +155,8 @@ abstract class AbstractPropelCommand extends ContainerAwareCommand
// Adding user defined properties from the configuration
$properties = array_merge(
$this->getContainer()->get('propel.build_properties')->getProperties(),
$properties
$properties,
$this->getContainer()->get('propel.build_properties')->getProperties()
);
foreach ($properties as $key => $value) {