From e2e8e57a93912554979560b07a64bfac2e9423db Mon Sep 17 00:00:00 2001
From: andrewshuba <andrew.shuba2@gmail.com>
Date: Fri, 15 Jan 2021 15:37:45 +0200
Subject: [PATCH 1/3] - change hook for a locations extension

---
 includes/core/class-member-directory.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php
index c715b303..1eddd458 100644
--- a/includes/core/class-member-directory.php
+++ b/includes/core/class-member-directory.php
@@ -2518,17 +2518,17 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 			 * @change_log
 			 * ["Since: 2.0"]
 			 * @usage
-			 * <?php add_filter( 'um_prepare_user_results_array', 'function_name', 10, 1 ); ?>
+			 * <?php add_filter( 'um_prepare_user_results_array', 'function_name', 10, 2 ); ?>
 			 * @example
 			 * <?php
-			 * add_filter( 'um_prepare_user_results_array', 'my_prepare_user_results', 10, 1 );
-			 * function my_prepare_user_results( $user_ids ) {
+			 * add_filter( 'um_prepare_user_results_array', 'my_prepare_user_results', 10, 2 );
+			 * function my_prepare_user_results( $user_ids, $query ) {
 			 *     // your code here
 			 *     return $user_ids;
 			 * }
 			 * ?>
 			 */
-			$user_ids = apply_filters( 'um_prepare_user_results_array', $user_ids );
+			$user_ids = apply_filters( 'um_prepare_user_results_array', $user_ids, $this->query_args  );
 
 
 			$sizes = UM()->options()->get( 'cover_thumb_sizes' );

From 9a298581dca0b4018476190e08b2cb11be6d3bd8 Mon Sep 17 00:00:00 2001
From: andrewshuba <andrew.shuba2@gmail.com>
Date: Tue, 19 Jan 2021 13:54:31 +0200
Subject: [PATCH 2/3] - changes for a meta table

---
 includes/core/class-member-directory-meta.php | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/includes/core/class-member-directory-meta.php b/includes/core/class-member-directory-meta.php
index af70f0b8..33dc6f8f 100644
--- a/includes/core/class-member-directory-meta.php
+++ b/includes/core/class-member-directory-meta.php
@@ -829,8 +829,38 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
 				{$this->sql_limit}"
 			);
 
+			$query = array(
+				'select' => $this->select,
+				'sql_where' => $sql_where,
+				'having' => $this->having,
+				'sql_limit' => $this->sql_limit,
+			);
+
 			$total_users = (int) $wpdb->get_var( 'SELECT FOUND_ROWS()' );
 
+			/**
+			 * UM hook
+			 *
+			 * @type filter
+			 * @title um_prepare_user_results_array_meta
+			 * @description Extend member directory query result
+			 * @input_vars
+			 * [{"var":"$result","type":"array","desc":"Members Query Result"}]
+			 * @change_log
+			 * ["Since: 2.0"]
+			 * @usage
+			 * <?php add_filter( 'um_prepare_user_results_array', 'function_name', 10, 2 ); ?>
+			 * @example
+			 * <?php
+			 * add_filter( 'um_prepare_user_results_array', 'my_prepare_user_results', 10, 2 );
+			 * function my_prepare_user_results( $user_ids, $query ) {
+			 *     // your code here
+			 *     return $user_ids;
+			 * }
+			 * ?>
+			 */
+			$user_ids = apply_filters( 'um_prepare_user_results_array_meta', $user_ids, $query );
+
 			$pagination_data = $this->calculate_pagination( $directory_data, $total_users );
 
 			$sizes = UM()->options()->get( 'cover_thumb_sizes' );

From be4b56b5d65176f21f1efc24a1c4950f2b60f675 Mon Sep 17 00:00:00 2001
From: andrewshuba <andrew.shuba2@gmail.com>
Date: Wed, 20 Jan 2021 15:26:01 +0200
Subject: [PATCH 3/3] - add comment about SQL_CALC_FOUND_ROWS

---
 includes/core/class-member-directory-meta.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/includes/core/class-member-directory-meta.php b/includes/core/class-member-directory-meta.php
index 33dc6f8f..bcddc2ad 100644
--- a/includes/core/class-member-directory-meta.php
+++ b/includes/core/class-member-directory-meta.php
@@ -818,6 +818,12 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
 
 			global $wpdb;
 
+			/*
+			 *
+			 * SQL_CALC_FOUND_ROWS is deprecated as of MySQL 8.0.17
+			 * https://core.trac.wordpress.org/ticket/47280
+			 *
+			 * */
 			$user_ids = $wpdb->get_col(
 				"SELECT SQL_CALC_FOUND_ROWS DISTINCT u.ID
 				{$this->select}