Merge branch 'develop' into trunk

Author: felipeelia

CHANGELOG.md

@@ -14,6 +14,15 @@ All notable changes to this project will be documented in this file, per [the Ke
 ### Developer
 -->
 
+## [5.3.2] - 2025-11-21
+
+### Added
+* Notice about keeping the sync page open during the sync process. Props [@felipeelia](https://github.com/felipeelia) and [@tott](https://github.com/tott) via [#4240](https://github.com/10up/ElasticPress/pull/4240).
+
+### Fixed
+* Media search not working in the admin dashboard. Props [@burhandodhy](https://github.com/burhandodhy), [@ognjanovic](https://github.com/ognjanovic), and [@maciejmackowiak](https://github.com/maciejmackowiak) via [#4239](https://github.com/10up/ElasticPress/pull/4239).
+* [Autosuggest] Setting allowed values. Props [@felipeelia](https://github.com/felipeelia) via [#4238](https://github.com/10up/ElasticPress/pull/4238).
+
 ## [5.3.1] - 2025-11-06
 
 ### Fixed
@@ -2300,6 +2309,8 @@ This is a bug fix release with some filter additions.
 - Initial plugin release
 
 [Unreleased]: https://github.com/10up/ElasticPress/compare/trunk...develop
+[5.3.2]: https://github.com/10up/ElasticPress/compare/5.3.1...5.3.2
+[5.3.1]: https://github.com/10up/ElasticPress/compare/5.3.0...5.3.1
 [5.3.0]: https://github.com/10up/ElasticPress/compare/5.2.0...5.3.0
 [5.2.0]: https://github.com/10up/ElasticPress/compare/5.1.4...5.2.0
 [5.1.4]: https://github.com/10up/ElasticPress/compare/5.1.3...5.1.4

CREDITS.md

@@ -260,6 +260,8 @@ Thank you to all the people who have already contributed to this repository via
 [Scott Buckel (@scottbuckel)](https://github.com/scottbuckel),
 [@jzzaj](https://github.com/jzzaj),
 [@DarioBF](https://github.com/DarioBF),
+[@ognjanovic](https://github.com/ognjanovic),
+[Maciej Maćkowiak (@maciejmackowiak)](https://github.com/maciejmackowiak),
 and
 [@qazaqstan2025](https://github.com/qazaqstan2025).
 

assets/js/sync-ui/apps/sync.js

@@ -131,6 +131,14 @@ export default () => {
 								: __('in Elasticsearch', 'elasticpress'),
 						)}
 			</p>
+			<p>
+				<b>
+					{__(
+						'The sync will pause if you close this window. Please keep it open until completion.',
+						'elasticpress',
+					)}
+				</b>
+			</p>
 			<Panel className="ep-sync-panel">
 				<PanelBody className="ep-sync-panel__controls">
 					{isSyncing || isComplete ? <Progress /> : null}

elasticpress.php

@@ -3,7 +3,7 @@
  * Plugin Name:       ElasticPress
  * Plugin URI:        https://github.com/10up/ElasticPress
  * Description:       A fast and flexible search and query engine for WordPress.
- * Version:           5.3.1
+ * Version:           5.3.2
  * Requires at least: 6.2
  * Requires PHP:      7.4
  * Author:            10up
@@ -33,7 +33,7 @@
 define( 'EP_URL', plugin_dir_url( __FILE__ ) );
 define( 'EP_PATH', plugin_dir_path( __FILE__ ) );
 define( 'EP_FILE', plugin_basename( __FILE__ ) );
-define( 'EP_VERSION', '5.3.1' );
+define( 'EP_VERSION', '5.3.2' );
 
 define( 'EP_PHP_VERSION_MIN', '7.4' );
 

includes/classes/Command.php

@@ -621,6 +621,18 @@ public function epio_set_autosuggest( $args, $assoc_args ) {
 		WP_CLI::success( esc_html__( 'Done.', 'elasticpress' ) );
 	}
 
+	/**
+	 * A WP-CLI wrapper to run `Autosuggest::post_deactivation()`.
+	 *
+	 * @subcommand epio-reset-autosuggest
+	 * @since      5.3.2
+	 */
+	public function epio_reset_autosuggest() {
+		Features::factory()->get_registered_feature( 'autosuggest' )->post_deactivation();
+
+		WP_CLI::success( esc_html__( 'Done.', 'elasticpress' ) );
+	}
+
 	/**
 	 * Helper method for creating the network alias for an indexable
 	 *

includes/classes/Feature.php

@@ -291,6 +291,23 @@ public function post_activation() {
 		do_action( 'ep_feature_post_activation', $this->slug, $this );
 	}
 
+	/**
+	 * To be run after feature deactivation
+	 *
+	 * @since 5.3.2
+	 */
+	public function post_deactivation() {
+		/**
+		 * Fires after feature is deactivated
+		 *
+		 * @hook ep_feature_post_deactivation
+		 * @param {string} $slug Feature slug
+		 * @param {Feature} $feature Current feature
+		 * @since 5.3.2
+		 */
+		do_action( 'ep_feature_post_deactivation', $this->slug, $this );
+	}
+
 	/**
 	 * Returns the feature title.
 	 *

includes/classes/Feature/Autosuggest/Autosuggest.php

@@ -686,6 +686,7 @@ public function epio_send_autosuggest_allowed() {
 
 		add_filter( 'ep_format_request_headers', [ $this, 'add_ep_set_autosuggest_header' ] );
 
+		$search_query['query_vars']['ep_intercept_request'] = false;
 		Elasticsearch::factory()->query( $index, 'post', $es_search_query, $search_query['query_vars'] );
 
 		remove_filter( 'ep_format_request_headers', [ $this, 'add_ep_set_autosuggest_header' ] );
@@ -790,6 +791,24 @@ public function epio_autosuggest_set_and_get() {
 		return $allowed_params;
 	}
 
+	/**
+	 * Send a request to EP.io to reset the allowed parameters for autosuggest.
+	 *
+	 * @since 5.3.2
+	 */
+	public function post_deactivation() {
+		$index = Indexables::factory()->get( 'post' )->get_index_name();
+
+		add_filter( 'ep_format_request_headers', [ $this, 'add_ep_set_autosuggest_header' ] );
+
+		Elasticsearch::factory()->query( $index, 'post', [], [] );
+
+		remove_filter( 'ep_format_request_headers', [ $this, 'add_ep_set_autosuggest_header' ] );
+
+		// this action is documented in Feature.php
+		do_action( 'ep_feature_post_deactivation', $this->slug, $this );
+	}
+
 	/**
 	 * Return true, so EP knows we want to intercept the remote request
 	 *

includes/classes/Feature/ProtectedContent/ProtectedContent.php

@@ -464,8 +464,9 @@ public function maybe_change_sort( $default_sort ) {
 	 * @return array
 	 */
 	public function filter_private_posts_for_current_user( $formatted_args, $args ): array {
-		$post_types = (array) $args['post_type'];
-
+		$post_statuses    = ! empty( $args['post_status'] ) ? $args['post_status'] : [];
+		$post_statuses    = is_string( $post_statuses ) ? explode( ',', $post_statuses ) : $post_statuses;
+		$post_types       = ! empty( $args['post_type'] ) ? (array) $args['post_type'] : [];
 		$valid_post_types = array_filter( $post_types, 'post_type_exists' );
 
 		$base_statuses = array_merge(
@@ -476,8 +477,9 @@ public function filter_private_posts_for_current_user( $formatted_args, $args ):
 					'show_in_admin_all_list' => true,
 				]
 			),
-			! empty( $args['post_status'] ) ? (array) $args['post_status'] : []
+			$post_statuses
 		);
+		$base_statuses = array_unique( $base_statuses );
 
 		$post_types_with_capability    = [];
 		$post_types_without_capability = [];
@@ -502,6 +504,7 @@ public function filter_private_posts_for_current_user( $formatted_args, $args ):
 
 		if ( ! empty( $post_types_with_capability ) ) {
 			$all_statuses = array_merge( $base_statuses, get_post_stati( [ 'private' => true ] ) );
+			$all_statuses = array_unique( $all_statuses );
 
 			$should_clauses[] = [
 				'bool' => [

includes/classes/Features.php

@@ -214,6 +214,9 @@ public function update_feature( $slug, $settings, $force = true, $target = 'curr
 
 			$feature->post_activation();
 		}
+		if ( $was_active && ! $is_active && method_exists( $feature, 'post_deactivation' ) ) {
+			$feature->post_deactivation();
+		}
 
 		/**
 		 * If the feature has a setting that requires reindexing, return

includes/classes/StatusReport/ElasticPressIo.php

@@ -60,10 +60,24 @@ protected function get_autosuggest_group(): array {
 		$title          = __( 'Allowed Autosuggest Parameters', 'elasticpress' );
 		$allowed_params = $autosuggest_feature->epio_autosuggest_set_and_get();
 
+		$reset_url = [
+			'label' => 'Reset URL',
+			'value' => wp_kses_post(
+				sprintf(
+					/* translators: %s: URL */
+					__( 'If you need to reset the allowed parameters, you can do so by saving your Search Fields & Weighting settings or by visiting <a href="%s">this URL</a>.', 'elasticpress' ),
+					$autosuggest_feature->get_epio_public_request_url()
+				)
+			),
+		];
+
 		if ( empty( $allowed_params ) ) {
-			$fields['not_available'] = [
-				'label' => __( 'Allowed Autosuggest Parameters', 'elasticpress' ),
-				'value' => __( 'Allowed autosuggest parameters info not available.', 'elasticpress' ),
+			$fields = [
+				'not_available' => [
+					'label' => __( 'Allowed Autosuggest Parameters', 'elasticpress' ),
+					'value' => __( 'Allowed autosuggest parameters info not available.', 'elasticpress' ),
+				],
+				'url'           => $reset_url,
 			];
 
 			return [
@@ -98,16 +112,7 @@ protected function get_autosuggest_group(): array {
 			];
 		}
 
-		$formatted_fields['url'] = [
-			'label' => 'Reset URL',
-			'value' => wp_kses_post(
-				sprintf(
-					/* translators: %s: URL */
-					__( 'If you need to reset the allowed parameters, you can do so by saving your Search Fields & Weighting settings or by visiting <a href="%s">this URL</a>.', 'elasticpress' ),
-					$autosuggest_feature->get_epio_public_request_url()
-				)
-			),
-		];
+		$formatted_fields['url'] = $reset_url;
 
 		return [
 			'title'  => $title,