Updates to 6.4.0-RC1

Author: ACF

acf.php

@@ -9,10 +9,10 @@
  * Plugin Name:       Advanced Custom Fields PRO
  * Plugin URI:        https://www.advancedcustomfields.com
  * Description:       Customize WordPress with powerful, professional and intuitive fields.
- * Version:           6.3.12
+ * Version:           6.4.0-RC1
  * Author:            WP Engine
  * Author URI:        https://wpengine.com/?utm_source=wordpress.org&utm_medium=referral&utm_campaign=plugin_directory&utm_content=advanced_custom_fields
- * Update URI:        false
+ * Update URI:        https://www.advancedcustomfields.com/pro
  * Text Domain:       acf
  * Domain Path:       /lang
  * Requires PHP:      7.4
@@ -36,7 +36,7 @@ class ACF {
 		 *
 		 * @var string
 		 */
-		public $version = '6.3.12';
+		public $version = '6.4.0-RC1';
 
 		/**
 		 * The plugin settings array.
@@ -130,9 +130,11 @@ public function initialize() {
 				'enable_shortcode'        => true,
 				'enable_bidirection'      => true,
 				'enable_block_bindings'   => true,
-				'enable_meta_box_cb_edit' => true,
 			);
 
+			// Include autoloader.
+			include_once __DIR__ . '/vendor/autoload.php';
+
 			// Include utility functions.
 			include_once ACF_PATH . 'includes/acf-utility-functions.php';
 
@@ -144,13 +146,21 @@ public function initialize() {
 			// Include classes.
 			acf_include( 'includes/class-acf-data.php' );
 			acf_include( 'includes/class-acf-internal-post-type.php' );
-			acf_include( 'includes/class-acf-site-health.php' );
 			acf_include( 'includes/fields/class-acf-field.php' );
 			acf_include( 'includes/locations/abstract-acf-legacy-location.php' );
 			acf_include( 'includes/locations/abstract-acf-location.php' );
 
+			// Initialise autoloaded classes.
+			new ACF\Site_Health\Site_Health();
+
 			// Include functions.
 			acf_include( 'includes/acf-helper-functions.php' );
+
+			acf_new_instance( 'ACF\Meta\Comment' );
+			acf_new_instance( 'ACF\Meta\Post' );
+			acf_new_instance( 'ACF\Meta\Term' );
+			acf_new_instance( 'ACF\Meta\User' );
+
 			acf_include( 'includes/acf-hook-functions.php' );
 			acf_include( 'includes/acf-field-functions.php' );
 			acf_include( 'includes/acf-bidirectional-functions.php' );
@@ -232,7 +242,9 @@ public function initialize() {
 			acf_include( 'includes/Updater/init.php' );
 
 			// Include PRO if included with this build.
-			acf_include( 'pro/acf-pro.php' );
+			if ( ! defined( 'ACF_PREVENT_PRO_LOAD' ) || ( defined( 'ACF_PREVENT_PRO_LOAD' ) && ! ACF_PREVENT_PRO_LOAD ) ) {
+				acf_include( 'pro/acf-pro.php' );
+			}
 
 			if ( is_admin() && function_exists( 'acf_is_pro' ) && ! acf_is_pro() ) {
 				acf_include( 'includes/admin/admin-options-pages-preview.php' );
@@ -395,9 +407,8 @@ public function init() {
 			 */
 			do_action( 'acf/include_taxonomies', ACF_MAJOR_VERSION );
 
-			// If we're on 6.5 or newer, load block bindings. This will move to an autoloader in 6.4.
-			if ( version_compare( get_bloginfo( 'version' ), '6.5-beta1', '>=' ) ) {
-				acf_include( 'includes/Blocks/Bindings.php' );
+			// If we're on 6.5 or newer, load block bindings.
+			if ( version_compare( get_bloginfo( 'version' ), '6.5', '>=' ) ) {
 				new ACF\Blocks\Bindings();
 			}
 

includes/acf-meta-functions.php

@@ -11,44 +11,21 @@
  * @return array
  */
 function acf_get_meta( $post_id = 0 ) {
-
 	// Allow filter to short-circuit load_value logic.
 	$null = apply_filters( 'acf/pre_load_meta', null, $post_id );
 	if ( $null !== null ) {
 		return ( $null === '__return_null' ) ? null : $null;
 	}
 
-	// Decode $post_id for $type and $id.
-	$decoded = acf_decode_post_id( $post_id );
+	// Decode the $post_id for $type and $id.
+	$decoded  = acf_decode_post_id( $post_id );
+	$instance = acf_get_meta_instance( $decoded['type'] );
+	$meta     = array();
 
-	/**
-	 * Determine CRUD function.
-	 *
-	 * - Relies on decoded post_id result to identify option or meta types.
-	 * - Uses xxx_metadata(type) instead of xxx_type_meta() to bypass additional logic that could alter the ID.
-	 */
-	if ( $decoded['type'] === 'option' ) {
-		$allmeta = acf_get_option_meta( $decoded['id'] );
-	} else {
-		$allmeta = get_metadata( $decoded['type'], $decoded['id'], '' );
+	if ( $instance ) {
+		$meta = $instance->get_meta( $decoded['id'] );
 	}
 
-	// Loop over meta and check that a reference exists for each value.
-	$meta = array();
-	if ( $allmeta ) {
-		foreach ( $allmeta as $key => $value ) {
-
-			// If a reference exists for this value, add it to the meta array.
-			if ( isset( $allmeta[ "_$key" ] ) ) {
-				$meta[ $key ]    = $allmeta[ $key ][0];
-				$meta[ "_$key" ] = $allmeta[ "_$key" ][0];
-			}
-		}
-	}
-
-	// Unserialized results (get_metadata does not unserialize if $key is empty).
-	$meta = array_map( 'acf_maybe_unserialize', $meta );
-
 	/**
 	 * Filters the $meta array after it has been loaded.
 	 *
@@ -74,7 +51,6 @@ function acf_get_meta( $post_id = 0 ) {
  * @return  array
  */
 function acf_get_option_meta( $prefix = '' ) {
-
 	// Globals.
 	global $wpdb;
 
@@ -241,32 +217,23 @@ function acf_delete_metadata( $post_id = 0, $name = '', $hidden = false ) {
 }
 
 /**
- * acf_copy_postmeta
- *
  * Copies meta from one post to another. Useful for saving and restoring revisions.
  *
- * @date    25/06/2016
  * @since   5.3.8
  *
- * @param   (int|string) $from_post_id The post id to copy from.
- * @param   (int|string) $to_post_id   The post id to paste to.
- * @return  void
+ * @param integer|string $from_post_id The post id to copy from.
+ * @param integer|string $to_post_id   The post id to paste to.
+ * @return void
  */
 function acf_copy_metadata( $from_post_id = 0, $to_post_id = 0 ) {
-
-	// Get all postmeta.
+	// Get all metadata.
 	$meta = acf_get_meta( $from_post_id );
 
-	// Check meta.
-	if ( $meta ) {
-
-		// Slash data. WP expects all data to be slashed and will unslash it (fixes '\' character issues).
-		$meta = wp_slash( $meta );
+	$decoded  = acf_decode_post_id( $to_post_id );
+	$instance = acf_get_meta_instance( $decoded['type'] );
 
-		// Loop over meta.
-		foreach ( $meta as $name => $value ) {
-			acf_update_metadata( $to_post_id, $name, $value );
-		}
+	if ( $meta && $instance ) {
+		$instance->update_meta( $decoded['id'], $meta );
 	}
 }
 
@@ -382,3 +349,155 @@ function acf_update_metaref( $post_id = 0, $type = 'fields', $references = array
 	// Update metadata.
 	return acf_update_metadata( $post_id, "_acf_$type", $references );
 }
+
+/**
+ * Retrieves an ACF meta instance for the provided meta type.
+ *
+ * @since 6.4
+ *
+ * @param string $type The meta type as decoded from the post ID.
+ * @return object|null
+ */
+function acf_get_meta_instance( string $type ): ?object {
+	$instance       = null;
+	$meta_locations = acf_get_store( 'acf-meta-locations' );
+
+	if ( $meta_locations && $meta_locations->has( $type ) ) {
+		$instance = acf_get_instance( $meta_locations->get( $type ) );
+	}
+
+	return $instance;
+}
+
+/**
+ * Gets metadata from the database.
+ *
+ * @since 6.4
+ *
+ * @param integer|string $post_id The post id.
+ * @param array          $field   The field array.
+ * @param boolean        $hidden  True if we should return the reference key.
+ * @return mixed
+ */
+function acf_get_metadata_by_field( $post_id = 0, $field = array(), bool $hidden = false ) {
+	if ( empty( $field['name'] ) ) {
+		return null;
+	}
+
+	// Allow filter to short-circuit logic.
+	$null = apply_filters( 'acf/pre_load_metadata', null, $post_id, $field['name'], $hidden );
+	if ( $null !== null ) {
+		return ( $null === '__return_null' ) ? null : $null;
+	}
+
+	// Decode the $post_id for $type and $id.
+	$decoded = acf_decode_post_id( $post_id );
+	$id      = $decoded['id'];
+	$type    = $decoded['type'];
+
+	// Bail early if no $id (possible during new acf_form).
+	if ( ! $id ) {
+		return null;
+	}
+
+	$meta_instance = acf_get_meta_instance( $type );
+
+	if ( ! $meta_instance ) {
+		return false;
+	}
+
+	if ( $hidden ) {
+		return $meta_instance->get_reference( $id, $field['name'] );
+	}
+
+	return $meta_instance->get_value( $id, $field );
+}
+
+/**
+ * Updates metadata in the database.
+ *
+ * @since 6.4
+ *
+ * @param integer|string $post_id The post id.
+ * @param array          $field   The field array.
+ * @param mixed          $value   The meta value.
+ * @param boolean        $hidden  True if we should update the reference key.
+ * @return integer|boolean Meta ID if the key didn't exist, true on successful update, false on failure.
+ */
+function acf_update_metadata_by_field( $post_id = 0, $field = array(), $value = '', bool $hidden = false ) {
+	if ( empty( $field['name'] ) ) {
+		return null;
+	}
+
+	// Allow filter to short-circuit logic.
+	$pre = apply_filters( 'acf/pre_update_metadata', null, $post_id, $field['name'], $value, $hidden );
+	if ( $pre !== null ) {
+		return $pre;
+	}
+
+	// Decode the $post_id for $type and $id.
+	$decoded = acf_decode_post_id( $post_id );
+	$id      = $decoded['id'];
+	$type    = $decoded['type'];
+
+	// Bail early if no $id (possible during new acf_form).
+	if ( ! $id ) {
+		return false;
+	}
+
+	$meta_instance = acf_get_meta_instance( $type );
+
+	if ( ! $meta_instance ) {
+		return false;
+	}
+
+	if ( $hidden ) {
+		return $meta_instance->update_reference( $id, $field['name'], $field['key'] );
+	}
+
+	return $meta_instance->update_value( $id, $field, $value );
+}
+
+/**
+ * Deletes metadata from the database.
+ *
+ * @since 6.4
+ *
+ * @param integer|string $post_id The post id.
+ * @param array          $field   The field array.
+ * @param boolean        $hidden  True if we should update the reference key.
+ * @return boolean
+ */
+function acf_delete_metadata_by_field( $post_id = 0, $field = array(), bool $hidden = false ) {
+	if ( empty( $field['name'] ) ) {
+		return null;
+	}
+
+	// Allow filter to short-circuit logic.
+	$pre = apply_filters( 'acf/pre_delete_metadata', null, $post_id, $field['name'], $hidden );
+	if ( $pre !== null ) {
+		return $pre;
+	}
+
+	// Decode the $post_id for $type and $id.
+	$decoded = acf_decode_post_id( $post_id );
+	$id      = $decoded['id'];
+	$type    = $decoded['type'];
+
+	// Bail early if no $id (possible during new acf_form).
+	if ( ! $id ) {
+		return false;
+	}
+
+	$meta_instance = acf_get_meta_instance( $type );
+
+	if ( ! $meta_instance ) {
+		return false;
+	}
+
+	if ( $hidden ) {
+		return $meta_instance->delete_reference( $id, $field['name'] );
+	}
+
+	return $meta_instance->delete_value( $id, $field );
+}