- added upgrade for groups extension;

- deprecate a few functions;

includes/admin/core/packages/2.1.0-beta1/member-directory.php

@@ -135,4 +135,47 @@ if ( UM()->options()->get( 'members_page' ) ) {
 	if ( $member_directory_id ) {
 		UM()->options()->update( 'user_tags_base_directory' , $member_directory_id );
 	}
+}
+
+
+// update groups settings
+$groups_query = new WP_Query;
+$groups = $groups_query->query( array(
+	'post_type'         => 'um_groups',
+	'posts_per_page'    => -1,
+	'fields'            => 'ids',
+) );
+
+if ( ! empty( $groups ) && ! is_wp_error( $groups ) ) {
+	foreach ( $groups as $id ) {
+		$filters_enabled = get_post_meta( $id, '_um_groups_invites_search_fields', true );
+		if ( ! empty( $filters_enabled ) ) {
+			$filters = $filters_old = get_post_meta( $id, '_um_groups_invites_fields', true );
+			if ( ! empty( $filters ) ) {
+				if ( false !== ( $last_login_key = array_search( '_um_last_login', $filters ) ) ) {
+					unset( $filters[ $last_login_key ] );
+					$filters[] = 'last_login';
+				}
+
+				if ( false !== ( $user_rating_key = array_search( 'user_rating', $filters ) ) ) {
+					unset( $filters[ $user_rating_key ] );
+					$filters[] = 'filter_rating';
+				}
+
+				$filter_fields = array_intersect( $filters, array_keys( UM()->member_directory()->filter_fields ) );
+
+				$general_search_fields = array_diff( $filters, array_keys( UM()->member_directory()->filter_fields ) );
+				$search_active = count( $general_search_fields ) > 0 ? 1 : 0;
+
+				update_post_meta( $id, '_um_groups_invites_fields', $filter_fields );
+				update_post_meta( $id, '_um_groups_invites_fields_old', $filters_old );
+
+				$search_enabled = get_post_meta( $id, '_um_groups_invites_search', true );
+				if ( empty( $search_enabled ) && $search_active ) {
+					update_post_meta( $id, '_um_groups_invites_search', true );
+					update_post_meta( $id, '_um_groups_invites_search_old', $search_enabled );
+				}
+			}
+		}
+	}
 }

includes/core/class-member-directory.php

@@ -92,7 +92,6 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 		function __construct() {
 			add_filter( 'plugins_loaded', array( &$this, 'init_variables' ), 99999 );
 			add_filter( 'init', array( &$this, 'init_filter_types' ), 2 );
-			//add_filter( 'um_member_directory_meta_value_before_save', array( &$this, 'before_save_data' ), 10, 3 );
 
 			add_action( 'template_redirect', array( &$this, 'access_members' ), 555 );
 		}

includes/um-deprecated-functions.php

@@ -496,4 +496,80 @@ function um_get_search_query() {
 	$search = isset( $query['search'] ) ? $query['search'] : '';
 
 	return um_filter_search( $search );
+}
+
+
+/**
+ * Check value of queried search in text input
+ *
+ * @deprecated 2.1.0
+ *
+ * @param $filter
+ * @param bool $echo
+ *
+ * @return mixed|string
+ */
+function um_queried_search_value( $filter, $echo = true ) {
+	$value = '';
+	if (isset( $_REQUEST['um_search'] )) {
+		$query = UM()->permalinks()->get_query_array();
+		if (isset( $query[$filter] ) && $query[$filter] != '') {
+			$value = stripslashes_deep( $query[$filter] );
+		}
+	}
+
+	if ($echo) {
+		echo $value;
+
+		return '';
+	} else {
+		return $value;
+	}
+
+}
+
+
+/**
+ * Check whether item in dropdown is selected in query-url
+ *
+ * @deprecated 2.1.0
+ *
+ * @param $filter
+ * @param $val
+ */
+function um_select_if_in_query_params( $filter, $val ) {
+	$selected = false;
+
+	if (isset( $_REQUEST['um_search'] )) {
+		$query = UM()->permalinks()->get_query_array();
+
+		if (isset( $query[$filter] ) && $val == $query[$filter])
+			$selected = true;
+
+		/**
+		 * UM hook
+		 *
+		 * @type filter
+		 * @title um_selected_if_in_query_params
+		 * @description Make selected or unselected from query attribute
+		 * @input_vars
+		 * [{"var":"$selected","type":"bool","desc":"Selected or not"},
+		 * {"var":"$filter","type":"string","desc":"Check by this filter in query"},
+		 * {"var":"$val","type":"string","desc":"Field Value"}]
+		 * @change_log
+		 * ["Since: 2.0"]
+		 * @usage add_filter( 'um_selected_if_in_query_params', 'function_name', 10, 3 );
+		 * @example
+		 * <?php
+		 * add_filter( 'um_selected_if_in_query_params', 'my_selected_if_in_query_params', 10, 3 );
+		 * function my_selected_if_in_query_params( $selected, $filter, $val ) {
+		 *     // your code here
+		 *     return $selected;
+		 * }
+		 * ?>
+		 */
+		$selected = apply_filters( 'um_selected_if_in_query_params', $selected, $filter, $val );
+	}
+
+	echo $selected ? 'selected="selected"' : '';
 }

includes/um-short-functions.php

@@ -1141,78 +1141,6 @@ function um_is_core_post( $post, $core_page ) {
 }
 
 
-/**
- * Check value of queried search in text input
- *
- * @param $filter
- * @param bool $echo
- *
- * @return mixed|string
- */
-function um_queried_search_value( $filter, $echo = true ) {
-	$value = '';
-	if (isset( $_REQUEST['um_search'] )) {
-		$query = UM()->permalinks()->get_query_array();
-		if (isset( $query[$filter] ) && $query[$filter] != '') {
-			$value = stripslashes_deep( $query[$filter] );
-		}
-	}
-
-	if ($echo) {
-		echo $value;
-
-		return '';
-	} else {
-		return $value;
-	}
-
-}
-
-
-/**
- * Check whether item in dropdown is selected in query-url
- *
- * @param $filter
- * @param $val
- */
-function um_select_if_in_query_params( $filter, $val ) {
-	$selected = false;
-
-	if (isset( $_REQUEST['um_search'] )) {
-		$query = UM()->permalinks()->get_query_array();
-
-		if (isset( $query[$filter] ) && $val == $query[$filter])
-			$selected = true;
-
-		/**
-		 * UM hook
-		 *
-		 * @type filter
-		 * @title um_selected_if_in_query_params
-		 * @description Make selected or unselected from query attribute
-		 * @input_vars
-		 * [{"var":"$selected","type":"bool","desc":"Selected or not"},
-		 * {"var":"$filter","type":"string","desc":"Check by this filter in query"},
-		 * {"var":"$val","type":"string","desc":"Field Value"}]
-		 * @change_log
-		 * ["Since: 2.0"]
-		 * @usage add_filter( 'um_selected_if_in_query_params', 'function_name', 10, 3 );
-		 * @example
-		 * <?php
-		 * add_filter( 'um_selected_if_in_query_params', 'my_selected_if_in_query_params', 10, 3 );
-		 * function my_selected_if_in_query_params( $selected, $filter, $val ) {
-		 *     // your code here
-		 *     return $selected;
-		 * }
-		 * ?>
-		 */
-		$selected = apply_filters( 'um_selected_if_in_query_params', $selected, $filter, $val );
-	}
-
-	echo $selected ? 'selected="selected"' : '';
-}
-
-
 /**
  * Get styling defaults
  *