Merge pull request #59 from NiklasBr/elementid-pimcorex

Backport #58 to Pimcore X
dachcom-digital · Dec 14, 2023 · 73fa4e8 · 73fa4e8
2 parents 93de4ad + 96ec94f
commit 73fa4e8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -1,9 +1,9 @@
 name: Codeception
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
 
 jobs:
     codeception:

diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml
@@ -1,9 +1,9 @@
 name: Easy Coding Standards
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
 
 jobs:
     ecs:

diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
@@ -1,9 +1,9 @@
 name: PHP Stan
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
 
 jobs:
     stan:

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,8 @@
 # Upgrade Notes
 
+## 2.2.1
+- [BUGFIX] Skip meta data update when elementId is missing [@NiklasBr](https://github.com/dachcom-digital/pimcore-seo/pull/58)
+
 ## 2.2.0
 - [BUGFIX] fix encoding in schema json validation process [#45](https://github.com/dachcom-digital/pimcore-seo/issues/45)
 - [IMPROVEMENT] Respect Pimcore fallback languages [#44](https://github.com/dachcom-digital/pimcore-seo/issues/44)

diff --git a/src/SeoBundle/MetaData/Extractor/IntegratorExtractor.php b/src/SeoBundle/MetaData/Extractor/IntegratorExtractor.php
@@ -55,7 +55,7 @@ public function updateMetaData(mixed $element, ?string $locale, SeoMetaDataInter
             $elementType = 'document';
         }
 
-        if ($elementType === null) {
+        if ($elementType === null || !$elementId) {
             return;
         }