Merge pull request #1942 from ThemeFuse/issue#23906

Fix: bagrinsergiu/blox-editor#23906 - changing the way of versioning …
ThemeFuse · Oct 9, 2023 · 056206b · 056206b
2 parents 908716d + b0d4b57
commit 056206b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/editor/zip/archiver-interface.php b/editor/zip/archiver-interface.php
@@ -6,7 +6,7 @@ public function createZip( $posts, $fileName );
 
 	public function createFromZip( $zipPath );
 
-	public function getEditorVersion();
+	public function getSyncVersion();
 
 	public function isVersionSupported($version);
 

diff --git a/editor/zip/archiver.php b/editor/zip/archiver.php
@@ -20,17 +20,17 @@ class Brizy_Editor_Zip_Archiver implements Brizy_Editor_Zip_ArchiverInterface
     /**
      * @var string
      */
-    protected $editorVersion;
+    protected $syncVersion;
 
     public function __construct(
         Brizy_Editor_Project      $project,
         Brizy_Admin_Fonts_Manager $fontManager,
-                                  $editorVersion
+                                  $syncVersion
     )
     {
         $this->project = $project;
         $this->fontManager = $fontManager;
-        $this->editorVersion = $editorVersion;
+        $this->syncVersion = $syncVersion;
 
         if (!class_exists('ZipArchive')) {
             throw new InvalidArgumentException(__('Please install/enable php zip extension. Contact your hosting company for more info and help.'));
@@ -87,7 +87,7 @@ public function addEntityToZip(ZipArchive $z, Brizy_Editor_Zip_ArchiveItem $item
 			'meta' => $block->getMeta(),
             'media' => $block->getMedia(),
             'data' => $block->get_editor_data(),
-            'editorVersion' => $block->get_editor_version(),
+            'editorVersion' => $this->syncVersion,
             'files' => [
                 'images' => [],
                 'uploads' => [],
@@ -221,15 +221,15 @@ private function createSingleFromZipPath(ZipArchive $z, $dir)
         return $block;
     }
 
-    public function getEditorVersion()
-    {
-        return $this->editorVersion;
+    public function getSyncVersion() {
+	    return $this->syncVersion;
     }
 
     public function isVersionSupported($version)
     {
-        $version = preg_replace("/-wp/i", "", $version);
-        return version_compare($this->getEditorVersion(), $version, '>=');
+	    $version = preg_replace("/-wp/i", "", $version);
+	    $version = preg_replace("/-cloud/i", "", $version);
+        return version_compare($this->getSyncVersion(), $version, '>=');
     }
 
     protected function prepareArchiveFilepath($fileName)