Fix Multisite fields for compatibility with ACF 6.8.4 (#138)

Author: Bob-the-Builder-Bot

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 [Unreleased]
 
+## [1.41.8]
+
+### Fixed
+- Fix AJAX query compatibility with ACF Pro 6.8.4 for MultisiteRelationship, MultisiteTaxonomy, and Multitaxonomy fields. ACF added field-type nonce validation that rejected requests where the custom field type didn't match the parent's expected type. Shared fix extracted into `AcfAjaxQueryTrait`.
+
 ## [1.41.7]
 
 ### Fixed

plugin.php

@@ -3,7 +3,7 @@
 Plugin Name: ACF Codifier
 Plugin URI: https://github.com/devgeniem/acf-codifier
 Description: A helper class to make defining ACF field groups and fields easier in the code.
-Version: 1.41.7
+Version: 1.41.8
 Author: Miika Arponen / Geniem Oy
 Author URI: https://geniem.fi
 License: GPL-3.0

src/Fields/AcfAjaxQueryTrait.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * ACF Ajax query trait for custom field types.
+ */
+
+namespace Geniem\ACF\Fields;
+
+/**
+ * Trait AcfAjaxQueryTrait
+ *
+ * Overrides the parent ajax_query() to pass the correct field type name
+ * to acf_verify_ajax(). Required since ACF 6.8.4, which added field-type
+ * validation to AJAX nonce checks. Without this override the parent would
+ * pass its own type (e.g. 'post_object', 'relationship', 'taxonomy') instead
+ * of the custom type registered by the subclass, causing verification to fail.
+ *
+ * Classes using this trait must set $this->name to the registered field type
+ * string inside initialize().
+ */
+trait AcfAjaxQueryTrait {
+
+    /**
+     * Override parent ajax_query to use correct field type for nonce verification.
+     *
+     * @return void
+     */
+    public function ajax_query() {
+        $nonce             = \acf_request_arg( 'nonce', '' );
+        $key               = \acf_request_arg( 'field_key', '' );
+        $conditional_logic = (bool) \acf_request_arg( 'conditional_logic', false );
+
+        if ( $conditional_logic ) {
+            if ( ! \acf_current_user_can_admin() ) {
+                die();
+            }
+
+            $nonce = '';
+            $key   = '';
+        }
+
+        if ( ! \acf_verify_ajax( $nonce, $key, ! $conditional_logic, $this->name ) ) {
+            die();
+        }
+
+        \acf_send_ajax_results( $this->get_ajax_query( $_POST ) );
+    }
+}

src/Fields/MultisitePostObject.php

@@ -13,6 +13,8 @@
          */
         class MultisitePostObject extends \acf_field_post_object {
 
+            use AcfAjaxQueryTrait;
+
             /**
              * Initialize the field.
              *
@@ -51,36 +53,6 @@ public function input_admin_enqueue_scripts() {
                 );
             }
 
-            /**
-             * Override parent ajax_query to use correct field type for nonce verification.
-             *
-             * ACF 6.8.4 added field-type validation to AJAX nonce checks.
-             * The parent passes 'post_object' as expected type, but this field
-             * registers as 'multisite_post_object', causing verification to fail.
-             *
-             * @return void
-             */
-            public function ajax_query() {
-                $nonce             = \acf_request_arg( 'nonce', '' );
-                $key               = \acf_request_arg( 'field_key', '' );
-                $conditional_logic = (bool) \acf_request_arg( 'conditional_logic', false );
-
-                if ( $conditional_logic ) {
-                    if ( ! \acf_current_user_can_admin() ) {
-                        die();
-                    }
-
-                    $nonce = '';
-                    $key   = '';
-                }
-
-                if ( ! \acf_verify_ajax( $nonce, $key, ! $conditional_logic, 'multisite_post_object' ) ) {
-                    die();
-                }
-
-                \acf_send_ajax_results( $this->get_ajax_query( $_POST ) );
-            }
-
             /**
              * Switch to the selected blog when using
              * the parent method for fetching the AJAX response.

src/Fields/MultisiteRelationship.php

@@ -12,6 +12,8 @@
      */
     class ACF_Field_Multisite_Relationship extends \acf_field_relationship {
 
+        use AcfAjaxQueryTrait;
+
         /**
          * Initialize the field
          *

src/Fields/MultisiteTaxonomy.php

@@ -11,6 +11,8 @@
      */
     class ACF_Field_Multisite_Taxonomy extends Multitaxonomy {
 
+        use AcfAjaxQueryTrait;
+
         /**
          * Initialize the field
          *

src/Fields/Multitaxonomy.php

@@ -11,6 +11,8 @@
      */
     class Multitaxonomy extends \acf_field_taxonomy {
 
+        use AcfAjaxQueryTrait;
+
         /**
          * Initialize the field
          *