10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

- fixed cleaning buffer when return from show_filter;

Browse Source 
- fixed using different JS templates for different member directories (added member directory hash to JS templates);
This commit is contained in:
nikitasinelnikov
2019-11-26 19:05:07 +02:00
parent 2da12b3354
commit 1ca0a66d98
7 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/um-members.js
+1 -1
View File
@@ -328,7 +328,7 @@ function um_ajax_get_members( directory, args ) {
function um_build_template( directory, data ) { function um_build_template( directory, data ) {
var layout = directory.data('view_type'); var layout = directory.data('view_type');
var template = wp.template( 'um-member-' + layout ); var template = wp.template( 'um-member-' + layout + '-' + um_members_get_hash( directory ) );
directory.find('.um-members-grid, .um-members-list').remove(); directory.find('.um-members-grid, .um-members-list').remove();
directory.find('.um-members-wrapper').prepend( template( data.users ) ); directory.find('.um-members-wrapper').prepend( template( data.users ) );
assets/js/um-members.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
includes/core/class-member-directory.php
+2
View File
@@ -501,6 +501,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
} }
if ( empty( $values_array ) ) { if ( empty( $values_array ) ) {
ob_get_clean();
return ''; return '';
} }
@@ -552,6 +553,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
$attrs['options'] = apply_filters( 'um_member_directory_filter_select_options', $attrs['options'], $values_array, $attrs ); $attrs['options'] = apply_filters( 'um_member_directory_filter_select_options', $attrs['options'], $values_array, $attrs );
if ( empty( $attrs['options'] ) || ! is_array( $attrs['options'] ) ) { if ( empty( $attrs['options'] ) || ! is_array( $attrs['options'] ) ) {
ob_get_clean();
return ''; return '';
} }
languages/ultimate-member-en_US.po
+10 -10
View File
@@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Ultimate Member\n" "Project-Id-Version: Ultimate Member\n"
"POT-Creation-Date: 2019-11-26 12:16+0200\n" "POT-Creation-Date: 2019-11-26 19:03+0200\n"
"PO-Revision-Date: 2019-11-26 12:16+0200\n" "PO-Revision-Date: 2019-11-26 19:03+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: en_US\n" "Language: en_US\n"
@@ -274,7 +274,7 @@ msgstr ""
#: includes/admin/templates/form/register_customize.php:80 #: includes/admin/templates/form/register_customize.php:80
#: includes/admin/templates/form/register_gdpr.php:27 #: includes/admin/templates/form/register_gdpr.php:27
#: includes/core/class-builtin.php:1135 includes/core/class-builtin.php:1150 #: includes/core/class-builtin.php:1135 includes/core/class-builtin.php:1150
#: includes/core/class-member-directory.php:948 #: includes/core/class-member-directory.php:950
#: includes/core/um-filters-members.php:40 #: includes/core/um-filters-members.php:40
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
@@ -4576,7 +4576,7 @@ msgid "Register"
msgstr "" msgstr ""
#: includes/class-config.php:135 includes/class-config.php:789 #: includes/class-config.php:135 includes/class-config.php:789
#: includes/core/class-member-directory.php:1992 #: includes/core/class-member-directory.php:1994
#: includes/core/um-actions-profile.php:1255 #: includes/core/um-actions-profile.php:1255
#: includes/core/um-actions-user.php:19 #: includes/core/um-actions-user.php:19
msgid "Logout" msgid "Logout"
@@ -7127,22 +7127,22 @@ msgstr ""
msgid "User Registered" msgid "User Registered"
msgstr "" msgstr ""
#: includes/core/class-member-directory.php:746 #: includes/core/class-member-directory.php:748
msgid " stars" msgid " stars"
msgstr "" msgstr ""
#: includes/core/class-member-directory.php:754 #: includes/core/class-member-directory.php:756
msgid "<strong>Age:</strong>&nbsp;{min_range} - {max_range} years old" msgid "<strong>Age:</strong>&nbsp;{min_range} - {max_range} years old"
msgstr "" msgstr ""
#: includes/core/class-member-directory.php:1937 #: includes/core/class-member-directory.php:1939
#: includes/core/class-member-directory.php:1981 #: includes/core/class-member-directory.php:1983
#: includes/core/um-actions-profile.php:1222 #: includes/core/um-actions-profile.php:1222
#: includes/core/um-actions-profile.php:1253 #: includes/core/um-actions-profile.php:1253
msgid "Edit Profile" msgid "Edit Profile"
msgstr "" msgstr ""
#: includes/core/class-member-directory.php:1987 #: includes/core/class-member-directory.php:1989
#: includes/core/um-actions-profile.php:1254 #: includes/core/um-actions-profile.php:1254
msgid "My Account" msgid "My Account"
msgstr "" msgstr ""
@@ -7736,7 +7736,7 @@ msgstr ""
msgid "Search Users" msgid "Search Users"
msgstr "" msgstr ""
#: templates/members-grid.php:53 #: templates/members-grid.php:55
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
readme.txt
+1
View File
@@ -169,6 +169,7 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
- Fixed clearing filters with || condition - Fixed clearing filters with || condition
- Fixed endless recursion in the function um_check_conditions_on_submit() - Fixed endless recursion in the function um_check_conditions_on_submit()
- Fixed issue that appears if we try to update several plugins at once - Fixed issue that appears if we try to update several plugins at once
- Fixed using different templates for different member directories
= 2.1.1: November 12, 2019 = = 2.1.1: November 12, 2019 =
templates/members-grid.php
+4 -2
View File
@@ -1,6 +1,8 @@
<?php if ( ! defined( 'ABSPATH' ) ) exit; ?> <?php if ( ! defined( 'ABSPATH' ) ) exit;
<script type="text/template" id="tmpl-um-member-grid"> $unique_hash = substr( md5( $args['form_id'] ), 10, 5 ); ?>
<script type="text/template" id="tmpl-um-member-grid-<?php echo esc_attr( $unique_hash ) ?>">
<div class="um-members um-members-grid"> <div class="um-members um-members-grid">
<div class="um-gutter-sizer"></div> <div class="um-gutter-sizer"></div>
templates/members-list.php
+3 -2
View File
@@ -1,7 +1,8 @@
<?php if ( ! defined( 'ABSPATH' ) ) exit; ?> <?php if ( ! defined( 'ABSPATH' ) ) exit;
$unique_hash = substr( md5( $args['form_id'] ), 10, 5 ); ?>
<script type="text/template" id="tmpl-um-member-list"> <script type="text/template" id="tmpl-um-member-list-<?php echo esc_attr( $unique_hash ) ?>">
<div class="um-members um-members-list"> <div class="um-members um-members-list">
<# if ( data.length > 0 ) { #> <# if ( data.length > 0 ) { #>