Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/10.3' into 11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kingjia90 committed Aug 3, 2023
2 parents 671140b + 1384057 commit fc3ab72
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions .docker/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@

# mime types are already covered in nginx.conf
#include mime.types;
types {
image/avif avif;
}

upstream php-pimcore10 {
server php:9000;
Expand Down
2 changes: 1 addition & 1 deletion src/Twig/Extension/LanguageSwitcherExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function getLocalizedLinks(Document $document): array
}

$linkGeneratorService = $this->$generator;
if ($linkGeneratorService instanceof AbstractProductLinkGenerator) {
if ($linkGeneratorService instanceof LinkGeneratorInterface) {
$target = $linkGeneratorService->generate($object, ['locale' => \Locale::getPrimaryLanguage($language)]);
}
}
Expand Down

0 comments on commit fc3ab72

Please sign in to comment.