Skip to content

Commit

Permalink
Merge branch '5.5'
Browse files Browse the repository at this point in the history
* 5.5:
  Update changelog for 5.5.2 release
  [GeneratorBundle] getParameter should be called on the controller class
  • Loading branch information
acrobat committed Mar 24, 2020
2 parents e400c01 + 0439a80 commit 87dac63
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG-5.X.md
@@ -1,5 +1,9 @@
# Changelog

## 5.5.2 / 2020-03-24

* [GeneratorBundle] getParameter should be called on the controller class [#2654](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/2654) ([@acrobat](https://github.com/acrobat))

## 5.5.1 / 2020-03-19

* [AdminBundle] Aclvoter should only grant access for supported attributes with disabled permissions [#2653](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/2653) ([@acrobat](https://github.com/acrobat))
Expand Down
Expand Up @@ -32,7 +32,7 @@ public function indexAction(Request $request)
private function getLocale(Request $request)
{
$locales = array_filter(
explode('|', $this->container->getParameter('requiredlocales'))
explode('|', $this->getParameter('requiredlocales'))
);
return $request->getPreferredLanguage($locales);
}
Expand Down

0 comments on commit 87dac63

Please sign in to comment.