Merge branch 'release/5.9.1' into develop

acf.php

@@ -3,7 +3,7 @@
 Plugin Name: Advanced Custom Fields PRO
 Plugin URI: https://www.advancedcustomfields.com
 Description: Customize WordPress with powerful, professional and intuitive fields.
-Version: 5.8.7
+Version: 5.9.1
 Author: Elliot Condon
 Author URI: https://www.advancedcustomfields.com
 Text Domain: acf
@@ -17,7 +17,7 @@
 class ACF {
 
  /** @var string The plugin version number. */
- var $version = '5.8.7';
+ var $version = '5.9.1';
 
  /** @var array The plugin settings array. */
  var $settings = array();
@@ -108,7 +108,8 @@ function initialize() {
  // Include classes.
  acf_include('includes/class-acf-data.php');
  acf_include('includes/fields/class-acf-field.php');
- acf_include('includes/locations/class-acf-location.php');
+ acf_include('includes/locations/abstract-acf-legacy-location.php');
+ acf_include('includes/locations/abstract-acf-location.php');
 
  // Include functions.
  acf_include('includes/acf-helper-functions.php');
@@ -121,17 +122,18 @@ function initialize() {
  acf_include('includes/acf-user-functions.php');
  acf_include('includes/acf-value-functions.php');
  acf_include('includes/acf-input-functions.php');
+ acf_include('includes/acf-wp-functions.php');
 
  // Include core.
  acf_include('includes/fields.php');
  acf_include('includes/locations.php');
  acf_include('includes/assets.php');
  acf_include('includes/compatibility.php');
  acf_include('includes/deprecated.php');
- acf_include('includes/json.php');
  acf_include('includes/l10n.php');
  acf_include('includes/local-fields.php');
  acf_include('includes/local-meta.php');
+ acf_include('includes/local-json.php');
  acf_include('includes/loop.php');
  acf_include('includes/media.php');
  acf_include('includes/revisions.php');
@@ -144,6 +146,9 @@ function initialize() {
  acf_include('includes/ajax/class-acf-ajax-check-screen.php');
  acf_include('includes/ajax/class-acf-ajax-user-setting.php');
  acf_include('includes/ajax/class-acf-ajax-upgrade.php');
+ acf_include('includes/ajax/class-acf-ajax-query.php');
+ acf_include('includes/ajax/class-acf-ajax-query-users.php');
+ acf_include('includes/ajax/class-acf-ajax-local-json-diff.php');
 
  // Include forms.
  acf_include('includes/forms/form-attachment.php');
@@ -167,6 +172,9 @@ function initialize() {
  acf_include('includes/admin/admin-upgrade.php');
  }
 
+ // Include legacy.
+ acf_include('includes/legacy/legacy-locations.php');
+
  // Include PRO.
  acf_include('pro/acf-pro.php');
 
@@ -413,12 +421,12 @@ function register_post_status() {
 
  // Register the Disabled post status.
  register_post_status('acf-disabled', array(
- 'label' => __( 'Inactive', 'acf' ),
+ 'label' => _x( 'Disabled', 'post status', 'acf' ),
  'public' => true,
  'exclude_from_search' => false,
  'show_in_admin_all_list' => true,
  'show_in_admin_status_list' => true,
- 'label_count' => _n_noop( 'Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', 'acf' ),
+ 'label_count' => _n_noop( 'Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', 'acf' ),
  ));
  }
 
@@ -584,6 +592,38 @@ function new_instance( $class ) {
  $this->instances[ $name ] = $instance;
  return $instance;
  }
+
+ /**
+ * Magic __isset method for backwards compatibility.
+ *
+ * @date 24/4/20
+ * @since 5.9.0
+ *
+ * @param string $key Key name.
+ * @return bool
+ */
+ public function __isset( $key ) {
+ return in_array( $key, array( 'locations', 'json' ) );
+ }
+
+ /**
+ * Magic __get method for backwards compatibility.
+ *
+ * @date 24/4/20
+ * @since 5.9.0
+ *
+ * @param string $key Key name.
+ * @return mixed
+ */
+ public function __get( $key ) {
+ switch ( $key ) {
+ case 'locations':
+ return acf_get_instance( 'ACF_Legacy_Locations' );
+ case 'json':
+ return acf_get_instance( 'ACF_Local_JSON' );
+ }
+ return null;
+ }
 }
 
 /*