fix merge conflict

digitoimistodude · Oct 25, 2024 · 2195caf · 2195caf
2 parents 6a9e8bd + 0525269
commit 2195caf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### Unreleased
 
+* Add global variable for current block during `render_acf_block` (T-17629)
 * Add default styles for 404.scss
 * Make navigation to wrap automatically if there are too many links, T-20918
 * Add default column-gap to header, T-20918

diff --git a/inc/template-tags/acf-blocks.php b/inc/template-tags/acf-blocks.php
@@ -32,6 +32,9 @@ function render_acf_block( $block, $content = '', $is_preview = false, $post_id
   $cache_key    = "post_{$post_id}_{$block['id']}|{$content_hash}";
   $cache_key    = apply_filters( 'air_acf_block_cache_key', $cache_key, $block_slug, $post_id );
 
+  global $air_light_current_block;
+  $air_light_current_block = $block;
+
   // Get block contents
   if ( ! $block_cache_enabled ) {
     $cache_bypass_reason = $is_preview || 'development' === wp_get_environment_type() ? 'preview/development' : 'cache setting';