Fix multitaxonomy & multisite taxonomy compatibility with ACF v6.3.1 (#128)

Author: jaakkolehtonen

src/Fields/MultisiteTaxonomy.php

@@ -141,12 +141,13 @@ function get_ajax_query( $options = [] ) {
         /**
          *  This function returns the value label for the input element on the admin side.
          *
-         *  @param   \WP_Term $term    The term object.
-         *  @param   array    $field   The field settings.
-         *  @param   int      $post_id The post_id to which this value is saved to
+         *  @param   \WP_Term $term     The term object.
+         *  @param   array    $field    The field settings.
+         *  @param   int      $post_id  The post_id to which this value is saved to
+         *  @param   boolean  $unescape Should we return an unescaped post title.
          *  @return  string
          */
-        function get_term_title( $term, $field, $post_id = 0 ) {
+        function get_term_title( $term, $field, $post_id = 0, $unescape = false ) {
 
             // get post_id
             if ( ! $post_id ) {
@@ -168,6 +169,11 @@ function get_term_title( $term, $field, $post_id = 0 ) {
             // title
             $title .= $term->name;
 
+            // unescape for select2 output which handles the escaping.
+            if ( $unescape ) {
+                $title = html_entity_decode( $title );
+            }
+
             // filters
             $title = apply_filters( 'acf/fields/multisite_taxonomy/result', $title, $term, $field, $post_id );
             $title = apply_filters( 'acf/fields/multisite_taxonomy/result/name=' . $field['_name'], $title, $term, $field, $post_id );

src/Fields/Multitaxonomy.php

@@ -133,12 +133,13 @@ function get_ajax_query( $options = [] ) {
         /**
          *  This function returns the value label for the input element on the admin side.
          *
-         *  @param   \WP_Term $term    The term object.
-         *  @param   array    $field   The field settings.
-         *  @param   int      $post_id The post_id to which this value is saved to
+         *  @param   \WP_Term $term     The term object.
+         *  @param   array    $field    The field settings.
+         *  @param   int      $post_id  The post_id to which this value is saved to
+         *  @param   boolean  $unescape Should we return an unescaped post title.
          *  @return  string
          */
-        function get_term_title( $term, $field, $post_id = 0 ) {
+        function get_term_title( $term, $field, $post_id = 0, $unescape = false ) {
 
             // get post_id
             if ( ! $post_id ) {
@@ -160,6 +161,11 @@ function get_term_title( $term, $field, $post_id = 0 ) {
             // title
             $title .= $term->name;
 
+            // unescape for select2 output which handles the escaping.
+            if ( $unescape ) {
+                $title = html_entity_decode( $title );
+            }
+
             // filters
             $title = apply_filters( 'acf/fields/taxonomy/result', $title, $term, $field, $post_id );
             $title = apply_filters( 'acf/fields/taxonomy/result/name=' . $field['_name'], $title, $term, $field, $post_id );
@@ -508,7 +514,7 @@ function start_el( &$output, $term, $depth = 0, $args = [], $current_object_id =
 
             foreach ( $field['taxonomy'] as $taxonomy ) {
                 // taxonomy
-		        $taxonomy_obj = get_taxonomy( $taxonomy );
+                $taxonomy_obj = get_taxonomy( $taxonomy );
 
                 // vars
                 $args = [