mirror of
https://github.com/10h30/ultimatemember.git
synced 2026-07-12 19:26:35 +09:00
- fixed search + filters;
This commit is contained in:
@@ -1251,10 +1251,14 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
|
||||
// Add OR instead AND to search in WP core fields user_email, user_login, user_display_name
|
||||
$search_where = $context->get_search_sql( $search, UM()->member_directory()->core_search_fields, 'both' );
|
||||
|
||||
$replacement = apply_filters( 'um_member_directory_organic_search_replacement', " AND ( $1 )" );
|
||||
$search_where = preg_replace( '/ AND \((.*?)\)/im', $replacement, $search_where );
|
||||
$search_where = preg_replace( '/ AND \((.*?)\)/im', "$1 OR", $search_where );
|
||||
|
||||
$sql['where'] = $sql['where'] . $search_where;
|
||||
$sql['where'] = preg_replace(
|
||||
'/(' . $meta_join_for_search . '.meta_value = \'' . esc_attr( $search ) . '\')/im',
|
||||
trim( $search_where ) . " $1",
|
||||
$sql['where'],
|
||||
1
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1289,7 +1293,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
|
||||
$ignore_empty_filters = apply_filters( 'um_member_directory_ignore_empty_filters', false );
|
||||
|
||||
if ( empty( $filter_query ) && ! $ignore_empty_filters ) {
|
||||
add_filter( 'um_member_directory_organic_search_replacement', array( &$this, 'organic_replacement' ) );
|
||||
//add_filter( 'um_member_directory_organic_search_replacement', array( &$this, 'organic_replacement' ) );
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Ultimate Member\n"
|
||||
"POT-Creation-Date: 2019-10-04 15:02+0300\n"
|
||||
"PO-Revision-Date: 2019-10-04 15:02+0300\n"
|
||||
"POT-Creation-Date: 2019-10-08 12:29+0300\n"
|
||||
"PO-Revision-Date: 2019-10-08 12:29+0300\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"Language: en_US\n"
|
||||
@@ -4528,7 +4528,7 @@ msgid "Register"
|
||||
msgstr ""
|
||||
|
||||
#: includes/class-config.php:135 includes/class-config.php:779
|
||||
#: includes/core/class-member-directory.php:1893
|
||||
#: includes/core/class-member-directory.php:1897
|
||||
#: includes/core/um-actions-profile.php:1180
|
||||
#: includes/core/um-actions-user.php:19
|
||||
msgid "Logout"
|
||||
@@ -7077,14 +7077,14 @@ msgstr ""
|
||||
msgid "<strong>Age:</strong> {min_range} - {max_range} years old"
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-member-directory.php:1838
|
||||
#: includes/core/class-member-directory.php:1882
|
||||
#: includes/core/class-member-directory.php:1842
|
||||
#: includes/core/class-member-directory.php:1886
|
||||
#: includes/core/um-actions-profile.php:1147
|
||||
#: includes/core/um-actions-profile.php:1178
|
||||
msgid "Edit Profile"
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-member-directory.php:1888
|
||||
#: includes/core/class-member-directory.php:1892
|
||||
#: includes/core/um-actions-profile.php:1179
|
||||
msgid "My Account"
|
||||
msgstr ""
|
||||
|
||||
Reference in New Issue
Block a user