Changeset 3743904 for kirki/trunk/includes/API/Frontend/Controllers/CollectionController.php

Timestamp:

10/13/2026 12:30:44 PM (4 days ago)

Author:

themeum

Message:

Updated to 6.4.0

File:

• kirki/trunk/includes/API/Frontend/Controllers/CollectionController.php (modified) (4 diffs)

kirki/trunk/includes/API/Frontend/Controllers/CollectionController.php

@@ -110 +110 @@
                                 }
                         }else {
-                                $all_blocks = get_post_meta($post_id, 'kirki', true);
-                                $all_styles = Page::get_page_styleblocks($post_id, false);
-                                DataHelper::get_data_and_styles_from_root( $collection_data_id, $data_n_styles, $all_blocks['blocks'], $all_styles );
+                                // read_page_meta() resolves the most recent version to the right source
+                                // either post_meta or the staging table, depending on the post's state.
+                                $all_blocks = Page::read_page_meta( $post_id, 'kirki', false, null );
+                                $all_styles = Page::get_page_styleblocks( $post_id, false );
+                                if ( is_array( $all_blocks ) && isset( $all_blocks['blocks'] ) ) {
+                                        DataHelper::get_data_and_styles_from_root( $collection_data_id, $data_n_styles, $all_blocks['blocks'], $all_styles );
+                                }
                         }
                 }
@@ -154 +158 @@
                                 );
                         } elseif ( isset( $context['type'] ) && $context['type'] === 'term' ) {
-                                $options = array(
-                                        'term' => get_term( absint( $context['id'] ?? 0 ) )->to_array(),
+                                $term    = get_term( absint( $context['id'] ?? 0 ) );
+                                $options = array(
+                                        'term' => $term instanceof \WP_Term ? $term->to_array() : null,
                                 );
                         } elseif ( isset( $context['type'] ) && $context['type'] === 'comment' ) {
@@ -162 +167 @@
                                         'comment' => get_comment( absint( $context['comment']['comment_ID'] ?? 0 ) ),
                                 );
+                        } elseif ( isset( $context['type'] ) && $context['type'] === 'kirki_utility' ) {
+                                $options = array(
+                                        'kirki_utility_page_id' => absint( $context['kirki_utility_page_id'] ?? 0 ),
+                                );
                         }
                 }
 
+                // Never merge the raw request context here: only the values resolved above
+                // have passed get_item_permissions_check().
                 $params = array(
                         'blocks'       => $blocks,
@@ -176 +187 @@
                                         'q'                        => $query,
                                 ),
-                                $options,
-                                $context
+                                $options
                         ),
                         'search_related_collection_ids' => [$collection_id => true],