Changeset 3320573

Timestamp:

07/01/2025 11:35:35 AM (8 months ago)

Author:

smartling

Message:

Update to v 3.11.6

Location:

smartling-connector/trunk

Files:

• inc/Smartling/ContentTypes/ExternalContentElementor.php (modified) (5 diffs)
• inc/Smartling/ContentTypes/ExternalContentGravityForms.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• smartling-connector.php (modified) (1 diff)

smartling-connector/trunk/inc/Smartling/ContentTypes/ExternalContentElementor.php

@@ -4 +4 @@
 
 use Elementor\Core\Documents_Manager;
-use Elementor\TemplateLibrary\Source_Local;
+use ElementorPro\Plugin;
 use Smartling\Base\ExportedAPI;
 use Smartling\ContentTypes\Elementor\ElementFactory;
@@ -70 +70 @@
             return;
         }
-        $sourceLocalPath = WP_PLUGIN_DIR . '/elementor/includes/template-library/sources/local.php';
-        $terms = [];
-        if (file_exists($sourceLocalPath)) {
-            $terms = $this->siteHelper->withBlog($submission->getSourceBlogId(), function () use ($submission) {
-                return $this->wpProxy->wp_get_object_terms($submission->getSourceId(), Source_Local::TAXONOMY_TYPE_SLUG);
-            });
-        }
-        $this->siteHelper->withBlog($submission->getTargetBlogId(), function () use ($sourceLocalPath, $submission, $terms) {
+        $this->siteHelper->withBlog($submission->getTargetBlogId(), function () use ($submission) {
             $supportLevel = $this->getSupportLevel($submission->getContentType(), $submission->getTargetId());
-            $this->getLogger()->debug(sprintf('Processing Elementor after content written hook, contentType=%s, sourceBlogId=%d, sourceId=%d, submissionId=%d, targetBlogId=%d, targetId=%d, supportLevel=%s', $submission->getContentType(), $submission->getSourceBlogId(), $submission->getSourceId(), $submission->getId(), $submission->getTargetBlogId(), $submission->getTargetId(), $supportLevel));
-            $documentsManagerPath = WP_PLUGIN_DIR . '/elementor/core/documents-manager.php';
-            if ($supportLevel !== Pluggable::NOT_SUPPORTED && file_exists($documentsManagerPath)) {
-                $this->userHelper->asAdministratorOrEditor(function () use ($documentsManagerPath, $submission) {
+            $documentsManager = $this->getDocumentsManager();
+            if ($supportLevel !== Pluggable::NOT_SUPPORTED && $documentsManager !== null) {
+                $this->getLogger()->debug(sprintf('Processing Elementor after content written hook, contentType=%s, sourceBlogId=%d, sourceId=%d, submissionId=%d, targetBlogId=%d, targetId=%d, supportLevel=%s', $submission->getContentType(), $submission->getSourceBlogId(), $submission->getSourceId(), $submission->getId(), $submission->getTargetBlogId(), $submission->getTargetId(), $supportLevel));
+                $this->userHelper->asAdministratorOrEditor(function () use ($documentsManager, $submission) {
                     try {
-                        require_once $documentsManagerPath;
-                        $manager = new Documents_Manager();
-                        do_action('elementor/documents/register', $manager);
                         /** @noinspection PhpParamsInspection */
-                        $manager->ajax_save([
+                        $documentsManager->ajax_save([
                             'editor_post_id' => $submission->getTargetId(),
                             'elements' => json_decode($this->getDataFromPostMeta($submission->getTargetId()),
@@ -101 +91 @@
                 });
             }
-            if (file_exists($sourceLocalPath)) {
-                try {
-                    $newTerms = [];
-                    foreach ($terms as $term) {
-                        $add = $term->term_id;
-                        $related = $this->ensureSubmissionForRelatedTerm($submission, $term);
-                        if ($related !== null) {
-                            $add = $related->getTargetId();
-                        }
-                        $newTerms[] = $add;
-                    }
-                    $this->wpProxy->setObjectTerms($submission->getTargetId(), $newTerms, Source_Local::TAXONOMY_TYPE_SLUG);
-                } catch (\Throwable $e) {
-                    $this->getLogger()->notice(sprintf("Unable to check object terms in Elementor contentType=%s, submissionId=%d, targetBlogId=%d, targetId=%d: %s (%s)", $submission->getContentType(), $submission->getId(), $submission->getTargetBlogId(), $submission->getTargetId(), $e->getMessage(), $e->getTraceAsString()));
-                }
-            }
         });
         $this->getLogger()->info("Done processing Elementor after content written hook");
@@ -196 +170 @@
     {
         return $this->getData($this->readMeta($contentId))->getRelatedContentInfo()->getRelatedContentList();
-    }
-
-    public function ensureSubmissionForRelatedTerm(SubmissionEntity $submission, \WP_Term $term): ?SubmissionEntity
-    {
-        $result = $this->submissionManager->findOne([
-            SubmissionEntity::FIELD_CONTENT_TYPE => $term->taxonomy,
-            SubmissionEntity::FIELD_SOURCE_BLOG_ID => $submission->getSourceBlogId(),
-            SubmissionEntity::FIELD_SOURCE_ID => $term->term_id,
-            SubmissionEntity::FIELD_TARGET_BLOG_ID => $submission->getTargetBlogId(),
-        ]);
-        if ($result === null) {
-            $this->getLogger()->debug("Creating submission for termId=$term->term_id, taxonomy=$term->taxonomy, slug=$term->slug, name=$term->name");
-            $entity = $this->submissionManager->getSubmissionEntity($term->taxonomy, $submission->getSourceBlogId(), $term->term_id, $submission->getTargetBlogId());
-            $entity->setSourceTitle($term->name);
-            $entity->setIsCloned(1);
-            $stored = $this->submissionManager->storeEntity($entity);
-            do_action(ExportedAPI::ACTION_SMARTLING_CLONE_CONTENT, $stored);
-            $result = $this->submissionManager->getEntityById($stored->getId());
-        }
-        return $result;
     }
 
@@ -252 +206 @@
         return $translation;
     }
+
+    private function getDocumentsManager(): ?Documents_Manager
+    {
+        if (class_exists(Plugin::class)) {
+            return Plugin::elementor()->documents;
+        }
+        $documentsManagerPath = WP_PLUGIN_DIR . '/elementor/core/documents-manager.php';
+        if (file_exists($documentsManagerPath)) {
+            try {
+                require_once $documentsManagerPath;
+
+                $manager = new Documents_Manager();
+                do_action('elementor/documents/register', $manager);
+                return $manager;
+            } catch (\Throwable) {
+                // No documents manager available
+            }
+        }
+        if (class_exists(Documents_Manager::class)) {
+            return new Documents_Manager();
+        }
+
+        return null;
+    }
 }

smartling-connector/trunk/inc/Smartling/ContentTypes/ExternalContentGravityForms.php

@@ -62 +62 @@
             || ($this->contentTypeHelper->isPost($contentType)
                 && str_contains(
-                    $this->wpProxy->get_post($contentId)->post_content,
+                    $this->wpProxy->get_post($contentId)->post_content ?? '',
                     'gravityforms',
                 ))) {

smartling-connector/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.6.2
 Requires PHP: 8.0
-Stable tag: 3.11.4
+Stable tag: 3.11.6
 License: GPLv2 or later
 
@@ -63 +63 @@
 
 == Changelog ==
+= 3.11.6 =
+* Improve fix for Elementor Templates type mismatch after translation or cloning with Elementor Pro
+
 = 3.11.5 =
 * Fixed Elementor Templates type mismatch after translation or cloning

smartling-connector/trunk/smartling-connector.php

@@ -12 +12 @@
  * Plugin URI:        https://www.smartling.com/products/automate/integrations/wordpress/
  * Description:       Integrate your WordPress site with Smartling to upload your content and download translations.
- * Version:           3.11.5
+ * Version:           3.11.6
  * Author:            Smartling
  * Author URI:        https://www.smartling.com