Merge branch 'bug/element-url-site-ids' into release/1.9.4

AcclaroInc · Jan 14, 2021 · be7bbe2 · be7bbe2
2 parents 2dac510 + fce2038
commit be7bbe2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/Translations.php b/src/Translations.php
@@ -563,9 +563,6 @@ private function _onDeleteElement(Event $event)
 
                     $currentFile->status = 'canceled';
 
-                    $element = Craft::$app->getElements()->getElementById($currentFile->elementId, null, $currentFile->targetSite);
-                    $currentFile->previewUrl = Translations::$plugin->urlGenerator->generateElementPreviewUrl($element, $currentFile->targetSite);
-
                     $element = Craft::$app->getElements()->getElementById($currentFile->elementId, null, $currentFile->sourceSite);
                     $currentFile->previewUrl = Translations::$plugin->urlGenerator->generateElementPreviewUrl($element, $currentFile->targetSite);
                     $currentFile->source = Translations::$plugin->elementToXmlConverter->toXml(

diff --git a/src/services/ElementToXmlConverter.php b/src/services/ElementToXmlConverter.php
@@ -36,7 +36,7 @@ public function toXml(Element $element, $draftId = 0, $sourceSite = null, $targe
         $sites->setAttribute('target-site', $targetSite);
         $langs->setAttribute('source-language', Craft::$app->sites->getSiteById($sourceSite)->language);
         $langs->setAttribute('target-language', (Craft::$app->sites->getSiteById($targetSite)) ? Craft::$app->sites->getSiteById($targetSite)->language : 'deleted');
-        $original->setAttribute('url', Translations::$plugin->urlGenerator->generateElementPreviewUrl($element, $targetSite));
+        $original->setAttribute('url', Translations::$plugin->urlGenerator->generateElementPreviewUrl($element));
         $preview->setAttribute('url', $previewUrl);
 
         $elementIdMeta = $head->appendChild($dom->createElement('meta'));

diff --git a/src/services/UrlGenerator.php b/src/services/UrlGenerator.php
@@ -106,7 +106,7 @@ public function generateCpUrl($path)
         return Translations::$plugin->urlHelper->cpUrl($path);
     }
 
-    public function generateElementPreviewUrl(Element $element, $targetSite)
+    public function generateElementPreviewUrl(Element $element, $siteId)
     {
         $params = array();
 
@@ -123,7 +123,7 @@ public function generateElementPreviewUrl(Element $element, $targetSite)
                 'preview/preview', [
                     'elementType' => $className,
                     'sourceId' => $element->sourceId,
-                    'siteId' => $element->siteId,
+                    'siteId' => $siteId ? $siteId : $element->siteId,
                     'draftId' => $element->draftId,
                     'revisionId' => $element->revisionId
                 ]