Skip to content

Commit 44f7950

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: Show exception is checked twice in ExceptionController of twig allow SSI fragments configuration in XML files Display a better error message when the toolbar cannot be displayed render hidden _method field in form_rest() return fallback locales whenever possible
2 parents 8ca7761 + 4a65485 commit 44f7950

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DataCollectorTranslator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function getCatalogue($locale = null)
9595
*/
9696
public function getFallbackLocales()
9797
{
98-
if ($this->translator instanceof Translator) {
98+
if ($this->translator instanceof Translator || method_exists($this->translator, 'getFallbackLocales')) {
9999
return $this->translator->getFallbackLocales();
100100
}
101101

LoggingTranslator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function getCatalogue($locale = null)
9595
*/
9696
public function getFallbackLocales()
9797
{
98-
if ($this->translator instanceof Translator) {
98+
if ($this->translator instanceof Translator || method_exists($this->translator, 'getFallbackLocales')) {
9999
return $this->translator->getFallbackLocales();
100100
}
101101

0 commit comments

Comments
 (0)