Changeset 3789736 for mega-ai/trunk/mega.php

Timestamp:

11/07/2026 02:25:46 PM (less than one hour ago)

Author:

joegomega

Message:

Update to version 2.34.0 from GitHub

File:

• mega-ai/trunk/mega.php (modified) (4 diffs)

mega-ai/trunk/mega.php

@@ -3 +3 @@
 Plugin Name: MEGA AI
 Description: Connect your WordPress website to MEGA for automated SEO optimization and content management.
-Version: 2.33.0
+Version: 2.34.0
 Author: MEGA
 Author URI: https://gomega.ai
@@ -102 +102 @@
 class MegaPlugin {
     private static $namespace = 'mega';
-    private static $version = '2.33.0';
+    private static $version = '2.34.0';
 
     // Editor (widget) endpoints.
@@ -4000 +4000 @@
                 $draft_doc = MegaEditorBlocks::parse('nodes', $draft[0], $kind);
                 $same_bytes = !\is_wp_error($draft_doc) && MegaEditorBlocks::encode($draft_doc['source']) === MegaEditorBlocks::encode($doc['source']);
-                if (!$same_bytes && !$this->beaver_draft_matches_published($raw, $draft[0])) {
-                    return $this->editor_error('BUILDER_DRAFT_PENDING', 'This page has unpublished Beaver Builder changes (its draft differs from the published layout). Publish or discard them in Beaver first; nothing was written.', 409);
+                if (!$same_bytes) {
+                    $draft_check = $this->beaver_draft_comparison($raw, $draft[0]);
+                    if (!$draft_check['same']) {
+                        return $this->editor_error('BUILDER_DRAFT_PENDING', 'This page has unpublished Beaver Builder changes (its draft differs from the published layout). Publish or discard them in Beaver first; nothing was written.', 409, $draft_check['details']);
+                    }
                 }
                 $writes['_fl_builder_draft'] = $encoded;
@@ -4018 +4021 @@
      * never refresh it, so a long-lived process would compare a stale layout. Without Beaver loaded
      * there is no way to ask, and the caller keeps refusing.
-     */
-    private function beaver_draft_matches_published($published_raw, $draft_raw) {
-        if (!\class_exists('FLBuilderModel') || !\is_callable(array('FLBuilderModel', 'clean_layout_data'))) {
-            return false;
-        }
-        $clean = static function ($raw) {
-            $data = \FLBuilderModel::clean_layout_data(\maybe_unserialize($raw));
-            if (\class_exists('FLBuilderSettingsCompat') && \is_callable(array('FLBuilderSettingsCompat', 'filter_layout_data'))) {
-                $data = \FLBuilderSettingsCompat::filter_layout_data($data);
-            }
-            return $data;
+     *
+     * Returns array('same' => bool, 'details' => array) where the details say why a refusal was made
+     * without any page content: whether Beaver was loaded, both rows' byte length and sha256, and up
+     * to 10 nodes that differ with what differs (only in one, type, parent, position, or the names of
+     * up to 5 settings).
+     */
+    private function beaver_draft_comparison($published_raw, $draft_raw) {
+        $details = array(
+            'beaver_loaded' => \class_exists('FLBuilderModel') && \is_callable(array('FLBuilderModel', 'clean_layout_data')),
+            'published_bytes' => strlen((string) $published_raw),
+            'draft_bytes' => strlen((string) $draft_raw),
+            'published_sha256' => hash('sha256', (string) $published_raw),
+            'draft_sha256' => hash('sha256', (string) $draft_raw),
+            'clean_failed' => false,
+        );
+        $published = \maybe_unserialize($published_raw);
+        $draft = \maybe_unserialize($draft_raw);
+        $same = false;
+        if ($details['beaver_loaded']) {
+            $clean = static function ($data) {
+                $data = \FLBuilderModel::clean_layout_data($data);
+                if (\class_exists('FLBuilderSettingsCompat') && \is_callable(array('FLBuilderSettingsCompat', 'filter_layout_data'))) {
+                    $data = \FLBuilderSettingsCompat::filter_layout_data($data);
+                }
+                return $data;
+            };
+            try {
+                $published = $clean($published);
+                $draft = $clean($draft);
+                $same = !empty($published) && serialize($published) === serialize($draft);
+            } catch (\Throwable $e) {
+                $details['clean_failed'] = true;
+            }
+        }
+        if (!$same) {
+            $nodes = self::beaver_node_differences($published, $draft);
+            $details['differing_node_count'] = count($nodes);
+            $details['differing_nodes'] = array_slice($nodes, 0, 10);
+        }
+        return array('same' => $same, 'details' => $details);
+    }
+
+    /** "<node id>: <what differs>" for each node that is not the same in both Beaver layouts. */
+    private static function beaver_node_differences($published, $draft) {
+        $as_map = static function ($layout) {
+            $out = array();
+            if (is_array($layout) || is_object($layout)) {
+                foreach ((array) $layout as $id => $node) {
+                    $out[(string) $id] = is_object($node) ? (array) $node : (is_array($node) ? $node : array());
+                }
+            }
+            return $out;
         };
-        try {
-            $published = $clean($published_raw);
-            $draft = $clean($draft_raw);
-        } catch (\Throwable $e) {
-            return false;
-        }
-        return !empty($published) && serialize($published) === serialize($draft);
+        $a = $as_map($published);
+        $b = $as_map($draft);
+        $out = array();
+        foreach (array_unique(array_merge(array_keys($a), array_keys($b))) as $id) {
+            if (!isset($b[$id])) {
+                $out[] = $id . ': published only';
+                continue;
+            }
+            if (!isset($a[$id])) {
+                $out[] = $id . ': draft only';
+                continue;
+            }
+            $what = array();
+            foreach (array('type', 'parent', 'position') as $field) {
+                $x = isset($a[$id][$field]) ? $a[$id][$field] : null;
+                $y = isset($b[$id][$field]) ? $b[$id][$field] : null;
+                if ($x !== $y) $what[] = $field;
+            }
+            $sa = isset($a[$id]['settings']) ? (array) $a[$id]['settings'] : array();
+            $sb = isset($b[$id]['settings']) ? (array) $b[$id]['settings'] : array();
+            $keys = array();
+            foreach (array_unique(array_merge(array_keys($sa), array_keys($sb))) as $key) {
+                $x = array_key_exists($key, $sa) ? serialize($sa[$key]) : null;
+                $y = array_key_exists($key, $sb) ? serialize($sb[$key]) : null;
+                if ($x !== $y) $keys[] = (string) $key;
+            }
+            if ($keys !== array()) $what[] = 'settings ' . implode(',', array_slice($keys, 0, 5)) . (count($keys) > 5 ? ',...' : '');
+            $rest_a = $a[$id];
+            $rest_b = $b[$id];
+            unset($rest_a['type'], $rest_a['parent'], $rest_a['position'], $rest_a['settings'], $rest_b['type'], $rest_b['parent'], $rest_b['position'], $rest_b['settings']);
+            if (serialize($rest_a) !== serialize($rest_b)) $what[] = 'other fields';
+            if ($what !== array()) $out[] = $id . ': ' . implode('; ', $what);
+        }
+        return $out;
     }