Fix incompatibilities with ACF 6.3.10 (#131)

devgeniem · Nov 4, 2024 · b5af43a · b5af43a
1 parent a2eb7ef
commit b5af43a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 [Unreleased]
 
+## [1.41.3]
+
+### Fixed
+- Fix MultisiteTaxonomy and Multitaxonomy compatibility with ACF v6.3.10.
+
 ## [1.41.2]
 
 ### Fixed

diff --git a/plugin.php b/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.2
+Version: 1.41.3
 Author: Miika Arponen / Geniem Oy
 Author URI: https://geniem.fi
 License: GPL-3.0

diff --git a/src/Fields/MultisiteTaxonomy.php b/src/Fields/MultisiteTaxonomy.php
@@ -5,7 +5,7 @@
 
 namespace Geniem\ACF\Fields;
 
-add_action( 'acf/init', function() {
+add_action( 'acf/init', function () {
     /**
      * ACF MultisiteTaxonomy Relationship class
      */
@@ -79,7 +79,6 @@ function get_ajax_query( $options = [] ) {
                 ]
             );
 
-
             // bail early if a taxonomy does not exist
             $taxonomies_exist = $this->taxonomies_exist( $field['taxonomy'] );
 
@@ -201,7 +200,7 @@ protected function get_all_terms( $args ) {
             ] );
 
             // parameters changed in version 4.5
-            if( acf_version_compare( 'wp', '<', '4.5' ) ) {
+            if ( acf_version_compare( 'wp', '<', '4.5' ) ) {
                 return get_terms( $args['taxonomy'], $args );
             }
 
@@ -307,12 +306,15 @@ public function render_field( $field ) {
             // force value to array
             $field['value'] = acf_get_array( $field['value'] );
 
+            $nonce = wp_create_nonce( 'acf_field_' . $this->name . '_' . $field['key'] );
+
             // vars
             $div = [
                 'class'           => 'acf-multisite-taxonomy-field',
                 'data-ftype'      => $field['field_type'],
                 'data-taxonomy'   => $field['taxonomy'],
                 'data-allow_null' => $field['allow_null'],
+                'data-nonce'      => $nonce,
             ];
 
             // get taxonomy
@@ -331,13 +333,13 @@ public function render_field( $field ) {
 
                     $field['multiple'] = 0;
 
-                    $this->render_field_select( $field );
+                    $this->render_field_select( $field, $nonce );
 
                 } elseif ( $field['field_type'] == 'multi_select' ) {
 
                     $field['multiple'] = 1;
 
-                    $this->render_field_select( $field );
+                    $this->render_field_select( $field, $nonce );
 
                 } elseif ( $field['field_type'] == 'radio' ) {
 

diff --git a/src/Fields/Multitaxonomy.php b/src/Fields/Multitaxonomy.php
@@ -381,13 +381,16 @@ public function render_field( $field ) {
             // force value to array
             $field['value'] = acf_get_array( $field['value'] );
 
+            $nonce = wp_create_nonce( 'acf_field_' . $this->name . '_' . $field['key'] );
+
             // vars
             $div = [
                 'class'           => 'acf-multitaxonomy-field',
                 'data-save'       => $field['save_terms'],
                 'data-ftype'      => $field['field_type'],
                 'data-taxonomy'   => $field['taxonomy'],
                 'data-allow_null' => $field['allow_null'],
+                'data-nonce'      => $nonce,
             ];
 
             // get taxonomy
@@ -406,13 +409,13 @@ public function render_field( $field ) {
 
                     $field['multiple'] = 0;
 
-                    $this->render_field_select( $field );
+                    $this->render_field_select( $field, $nonce );
 
                 } elseif ( $field['field_type'] == 'multi_select' ) {
 
                     $field['multiple'] = 1;
 
-                    $this->render_field_select( $field );
+                    $this->render_field_select( $field, $nonce );
 
                 } elseif ( $field['field_type'] == 'radio' ) {
 
@@ -430,17 +433,19 @@ public function render_field( $field ) {
         }
 
         /**
-         * Render field select
+         * Render field select.
          *
          * @param array $field The field object.
+         * @param string $nonce The nonce.
          * @return void
          */
-        public function render_field_select( $field ) {
+        public function render_field_select( $field, $nonce ) {
 
             // Change Field into a select
             $field['type']     = 'select';
             $field['ui']       = 1;
             $field['ajax']     = 1;
+            $field['nonce']    = $nonce;
             $field['choices']  = [];
             $field['disabled'] = $field['disable'] ?? false;