v4.2.0: Sync with pro version - update copyright to 2026, refresh i18n files, apply PHPCS formatting

Author: ajaydsouza

README.md

@@ -8,9 +8,9 @@
 [![Required PHP](https://img.shields.io/wordpress/plugin/required-php/better-search?style=flat-square)](https://wordpress.org/plugins/better-search/)
 [![Active installs](https://img.shields.io/wordpress/plugin/installs/better-search?style=flat-square)](https://wordpress.org/plugins/better-search/)
 
-__Requires:__ 6.5
+__Requires:__ 6.6
 
-__Tested up to:__ 6.8
+__Tested up to:__ 6.9
 
 __License:__ [GPL-2.0+](https://www.gnu.org/licenses/gpl-2.0.html)
 

better-search.php

@@ -13,7 +13,7 @@
  * Plugin Name: Better Search
  * Plugin URI:  https://webberzone.com/plugins/better-search/
  * Description: Replace the default WordPress search with a contextual search. Search results are sorted by relevancy ensuring a better visitor search experience.
- * Version:     4.2.2-beta1
+ * Version:     4.2.2
  * Author:      WebberZone
  * Author URI:  https://webberzone.com/
  * Text Domain: better-search
@@ -34,7 +34,7 @@
 	 *
 	 * @since 2.9.3
 	 */
-	define( 'BETTER_SEARCH_VERSION', '4.2.2-beta1' );
+	define( 'BETTER_SEARCH_VERSION', '4.2.2' );
 }
 
 if ( ! defined( 'BETTER_SEARCH_PLUGIN_DIR' ) ) {

includes/util/class-cache.php

@@ -111,19 +111,98 @@ public static function get_keys() {
 	}
 
 	/**
-	 * Get the meta key based on a list of parameters.
+	 * Get the cache key based on a list of parameters.
 	 *
 	 * @since 3.3.0
 	 *
 	 * @param mixed  $attr    Array of attributes typically.
 	 * @param string $context Context of the cache key to be set.
 	 * @return string Cache meta key
 	 */
-	public static function get_key( $attr, $context = 'query' ) {
+	public static function get_key( $attr, $context = 'query' ): string {
+		$args = (array) $attr;
 
-		$key = sprintf( 'bs_cache_%1$s_%2$s', md5( wp_json_encode( $attr ) ), $context );
+		static $setting_types = null;
+		if ( null === $setting_types ) {
+			$setting_types = function_exists( 'bsearch_get_registered_settings_types' ) ? bsearch_get_registered_settings_types() : array();
+		}
+
+		// Remove args that don't affect query results.
+		$exclude_keys = array(
+			'echo',
+			'extra_class',
+			'heading',
+			'is_block',
+			'is_manual',
+			'is_shortcode',
+			'is_widget',
+			'other_attributes',
+		);
+
+		foreach ( $exclude_keys as $key ) {
+			unset( $args[ $key ] );
+		}
+
+		// Remove any keys ending in _header or _desc, or with type 'header'.
+		foreach ( $args as $key => $value ) {
+			if ( '_header' === substr( $key, -7 ) || '_desc' === substr( $key, -5 ) ) {
+				unset( $args[ $key ] );
+				continue;
+			}
+
+			if ( isset( $setting_types[ $key ] ) && 'header' === $setting_types[ $key ] ) {
+				unset( $args[ $key ] );
+			}
+		}
+
+		// Define categories of types for normalization.
+		$id_array_types     = array( 'postids', 'numbercsv', 'taxonomies' );
+		$string_array_types = array( 'posttypes', 'csv', 'multicheck' );
+		$numeric_types      = array( 'number', 'checkbox', 'select', 'radio', 'radiodesc' );
+
+		// Process arguments based on their registered types.
+		foreach ( $args as $key => $value ) {
+			$type = $setting_types[ $key ] ?? '';
+
+			if ( in_array( $type, $numeric_types, true ) && is_numeric( $value ) ) {
+				$args[ $key ] = (int) $value;
+			} elseif ( in_array( $type, $id_array_types, true ) ) {
+				$args[ $key ] = is_array( $value ) ? $value : wp_parse_id_list( $value );
+				$args[ $key ] = array_unique( array_map( 'absint', $args[ $key ] ) );
+				$args[ $key ] = array_filter( $args[ $key ] );
+				sort( $args[ $key ] );
+				if ( empty( $args[ $key ] ) ) {
+					unset( $args[ $key ] );
+				}
+			} elseif ( in_array( $type, $string_array_types, true ) ) {
+				if ( is_string( $value ) && strpos( $value, '=' ) !== false ) {
+					parse_str( $value, $parsed );
+					$value = array_keys( $parsed );
+				} elseif ( is_string( $value ) ) {
+					$value = explode( ',', $value );
+				}
+				$args[ $key ] = is_array( $value ) ? $value : array( $value );
+				$args[ $key ] = array_unique( array_map( 'strval', $args[ $key ] ) );
+				$args[ $key ] = array_filter( $args[ $key ] );
+				sort( $args[ $key ] );
+				if ( empty( $args[ $key ] ) ) {
+					unset( $args[ $key ] );
+				}
+			}
+		}
+
+		// Sort top-level arguments.
+		ksort( $args );
+
+		// Remove any remaining empty strings or null values.
+		foreach ( $args as $key => $value ) {
+			if ( '' === $value || null === $value ) {
+				unset( $args[ $key ] );
+			}
+		}
 
-		return $key;
+		// Generate cache key.
+		return sprintf( 'bs_cache_%1$s_%2$s', md5( wp_json_encode( $args ) ), $context );
 	}
 
 	/**