Skip to content

Commit

Permalink
Merge pull request #259 from hason/patch-1
Browse files Browse the repository at this point in the history
Remove duplicate line of code
  • Loading branch information
dbu committed Jun 4, 2016
2 parents 2e66db3 + aca4d97 commit 15c30e6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog
=========

1.3.4
-----

* Fixed bug with `default_locale` option in configuration.

1.3.3
-----

Expand Down
1 change: 0 additions & 1 deletion DependencyInjection/DoctrinePHPCRExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,6 @@ private function loadOdmLocales(array $config, ContainerBuilder $container)
$defaultLocale = key($config['locales']);
}
$container->setParameter('doctrine_phpcr.odm.default_locale', $defaultLocale);
$container->setParameter('doctrine_phpcr.odm.default_locale', key($config['locales']));
$container->setParameter('doctrine_phpcr.odm.locale_fallback', $config['locale_fallback']);

$localeChooser = $localeChooser ?: 'doctrine_phpcr.odm.locale_chooser';
Expand Down

0 comments on commit 15c30e6

Please sign in to comment.