Deploying version 6.3.3

acf.php

@@ -9,7 +9,7 @@
  * Plugin Name:       Advanced Custom Fields
  * Plugin URI:        https://www.advancedcustomfields.com
  * Description:       Customize WordPress with powerful, professional and intuitive fields.
- * Version:           6.3.2
+ * Version:           6.3.3
  * Author:            WP Engine
  * Author URI:        https://wpengine.com/?utm_source=wordpress.org&utm_medium=referral&utm_campaign=plugin_directory&utm_content=advanced_custom_fields
  * Text Domain:       acf
@@ -35,7 +35,7 @@ class ACF {
 		 *
 		 * @var string
 		 */
-		public $version = '6.3.2';
+		public $version = '6.3.3';
 
 		/**
 		 * The plugin settings array.

includes/admin/views/options-page-preview.php

@@ -23,7 +23,7 @@
 					<div class="acf-no-field-groups-wrapper">
 						<div class="acf-no-field-groups-inner acf-field-group-pro-features-content">
 							<img src="<?php echo esc_url( acf_get_url( 'assets/images/empty-post-types.svg' ) ); ?>" />
-								<h2><?php echo acf_esc_html( 'Upgrade to ACF PRO to create options pages in just a few clicks', 'acf' ); ?></h2>
+								<h2><?php echo acf_esc_html( __( 'Upgrade to ACF PRO to create options pages in just a few clicks', 'acf' ) ); ?></h2>
 								<p><?php echo acf_esc_html( $acf_options_pages_desc ); ?></p>
 								<div class="acf-ui-options-page-pro-features-actions">
 									<a target="_blank" href="<?php echo $acf_learn_more_link; ?>" class="acf-btn acf-btn-muted"><?php esc_html_e( 'Learn More', 'acf' ); ?> <i class="acf-icon acf-icon-arrow-up-right"></i></a><?php //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- escaped on generation. ?>

includes/ajax/class-acf-ajax-query-users.php

@@ -24,7 +24,20 @@ public function verify_request( $request ) {
 				return new WP_Error( 'acf_invalid_args', __( 'Invalid request args.', 'acf' ), array( 'status' => 404 ) );
 			}
 
-			if ( ! acf_verify_ajax( $request['nonce'], $request['field_key'] ) ) {
+			$nonce  = $request['nonce'];
+			$action = $request['field_key'];
+
+			if ( isset( $request['conditional_logic'] ) && true === (bool) $request['conditional_logic'] ) {
+				if ( ! acf_current_user_can_admin() ) {
+					return new WP_Error( 'acf_invalid_permissions', __( 'Sorry, you do not have permission to do that.', 'acf' ) );
+				}
+
+				// Use the standard ACF admin nonce.
+				$nonce  = '';
+				$action = '';
+			}
+
+			if ( ! acf_verify_ajax( $nonce, $action ) ) {
 				return new WP_Error( 'acf_invalid_nonce', __( 'Invalid nonce.', 'acf' ), array( 'status' => 404 ) );
 			}
 

includes/fields/class-acf-field-page_link.php

@@ -67,8 +67,19 @@ public function render_field_page_link_conditional_choices( $choices, $condition
 		 * @return void
 		 */
 		public function ajax_query() {
-			$nonce = acf_request_arg( 'nonce', '' );
-			$key   = acf_request_arg( 'field_key', '' );
+			$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();
+				}
+
+				// Use the standard ACF admin nonce.
+				$nonce = '';
+				$key   = '';
+			}
 
 			if ( ! acf_verify_ajax( $nonce, $key ) ) {
 				die();

includes/fields/class-acf-field-post_object.php

@@ -62,8 +62,19 @@ public function render_field_post_object_conditional_choices( $choices, $conditi
 		 * @return void
 		 */
 		public function ajax_query() {
-			$nonce = acf_request_arg( 'nonce', '' );
-			$key   = acf_request_arg( 'field_key', '' );
+			$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();
+				}
+
+				// Use the standard ACF admin nonce.
+				$nonce = '';
+				$key   = '';
+			}
 
 			if ( ! acf_verify_ajax( $nonce, $key ) ) {
 				die();

includes/fields/class-acf-field-relationship.php

@@ -88,8 +88,19 @@ function input_admin_enqueue_scripts() {
 		 * @return void
 		 */
 		public function ajax_query() {
-			$nonce = acf_request_arg( 'nonce', '' );
-			$key   = acf_request_arg( 'field_key', '' );
+			$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();
+				}
+
+				// Use the standard ACF admin nonce.
+				$nonce = '';
+				$key   = '';
+			}
 
 			if ( ! acf_verify_ajax( $nonce, $key ) ) {
 				die();

includes/fields/class-acf-field-taxonomy.php

@@ -56,8 +56,19 @@ public function initialize() {
 		 * @return void
 		 */
 		public function ajax_query() {
-			$nonce = acf_request_arg( 'nonce', '' );
-			$key   = acf_request_arg( 'field_key', '' );
+			$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();
+				}
+
+				// Use the standard ACF admin nonce.
+				$nonce = '';
+				$key   = '';
+			}
 
 			if ( ! acf_verify_ajax( $nonce, $key ) ) {
 				die();

lang/acf-ar.po

@@ -12,7 +12,7 @@
 # This file is distributed under the same license as Advanced Custom Fields.
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2024-06-24T10:56:57+00:00\n"
+"PO-Revision-Date: 2024-06-27T14:24:00+00:00\n"
 "Report-Msgid-Bugs-To: http://support.advancedcustomfields.com\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"

lang/acf-bg_BG.po

@@ -12,7 +12,7 @@
 # This file is distributed under the same license as Advanced Custom Fields.
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2024-06-24T10:56:57+00:00\n"
+"PO-Revision-Date: 2024-06-27T14:24:00+00:00\n"
 "Report-Msgid-Bugs-To: http://support.advancedcustomfields.com\n"
 "Language: bg_BG\n"
 "MIME-Version: 1.0\n"