mirror of
https://github.com/10h30/ultimatemember.git
synced 2026-07-11 18:56:10 +09:00
Merge pull request #1043 from ultimatemember/development/2.4.2
Development/2.4.2
This commit is contained in:
Nikita Sinelnikov
@@ -0,0 +1,17 @@
|
||||
name: JobBoardWP GitHub Actions
|
||||
|
||||
on: push
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: Install dependencies
|
||||
run: composer install --prefer-dist --no-progress --no-suggest
|
||||
|
||||
- name: Run CS
|
||||
run: vendor/bin/phpcs --standard=phpcs.xml .
|
||||
+13
@@ -222,3 +222,16 @@ assets/vendor/
|
||||
package-lock.json
|
||||
.idea/
|
||||
composer.lock
|
||||
|
||||
# exclude Composer installation
|
||||
composer.phar
|
||||
/vendor
|
||||
|
||||
# exclude WP-CLI installation
|
||||
wp-cli.phar
|
||||
|
||||
# exclude generated by phpDocumentor docs
|
||||
/documentor
|
||||
|
||||
#wp-hookdoc generated docs
|
||||
hookdocs
|
||||
|
||||
@@ -41,7 +41,7 @@ GNU Version 2 or Any Later Version
|
||||
|
||||
## Releases
|
||||
|
||||
[Official Release Version: 2.4.1](https://github.com/ultimatemember/ultimatemember/releases/tag/2.4.1).
|
||||
[Official Release Version: 2.4.2](https://github.com/ultimatemember/ultimatemember/releases/tag/2.4.2).
|
||||
|
||||
## Changelog
|
||||
|
||||
|
||||
+76
-83
@@ -881,10 +881,12 @@ small.um-max-filesize span{
|
||||
- Customize Select2 CSS
|
||||
*/
|
||||
|
||||
.select2-container.select2-container--open {
|
||||
.um-search-filter .select2-container.select2-container--open,
|
||||
.um-field .select2-container.select2-container--open {
|
||||
z-index: 9999999;
|
||||
}
|
||||
.select2.select2-container .select2-selection {
|
||||
.um-search-filter .select2.select2-container .select2-selection,
|
||||
.um-field .select2.select2-container .select2-selection {
|
||||
display: block !important;
|
||||
height: 40px;
|
||||
padding: 0 0 0 12px !important;
|
||||
@@ -894,8 +896,6 @@ small.um-max-filesize span{
|
||||
line-height: 35px !important;
|
||||
color: #666 !important;
|
||||
font-size: 15px !important;
|
||||
text-align: left !important;
|
||||
text-decoration: none !important;
|
||||
-moz-border-radius: 2px !important;
|
||||
-webkit-border-radius: 2px !important;
|
||||
border-radius: 2px !important;
|
||||
@@ -905,39 +905,37 @@ small.um-max-filesize span{
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
background: none !important;
|
||||
background-color: #fff !important;
|
||||
background: #fff !important;
|
||||
border: 1px solid #ddd !important;
|
||||
}
|
||||
.rtl .select2.select2-container .select2-selection {
|
||||
.rtl .um-search-filter .select2.select2-container .select2-selection,
|
||||
.rtl .um-field .select2.select2-container .select2-selection {
|
||||
padding: 0 12px 0 0 !important;
|
||||
}
|
||||
|
||||
.select2.select2-container .select2-selection .select2-selection__arrow {
|
||||
.um-search-filter .select2.select2-container .select2-selection .select2-selection__arrow,
|
||||
.um-field .select2.select2-container .select2-selection .select2-selection__arrow {
|
||||
display: inline-block !important;
|
||||
width: 34px !important;
|
||||
height: 100% !important;
|
||||
position: absolute !important;
|
||||
right: 0 !important;
|
||||
top: 0 !important;
|
||||
-moz-border-radius: 0 2px 2px 0 !important;
|
||||
-webkit-border-radius: 0 2px 2px 0 !important;
|
||||
border-radius: 0 2px 2px 0 !important;
|
||||
background-clip: padding-box !important;
|
||||
text-align: center !important;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
text-align: center;
|
||||
background: transparent !important;
|
||||
border-left: 0 !important;
|
||||
border: none !important;
|
||||
}
|
||||
.rtl .select2.select2-container .select2-selection .select2-selection__arrow {
|
||||
right: initial !important;
|
||||
left: 0 !important;
|
||||
.rtl .um-search-filter .select2.select2-container .select2-selection .select2-selection__arrow,
|
||||
.rtl .um-field .select2.select2-container .select2-selection .select2-selection__arrow {
|
||||
right: initial;
|
||||
left: 0;
|
||||
}
|
||||
|
||||
.select2.select2-container .select2-selection .select2-selection__arrow:before {
|
||||
.um-search-filter .select2.select2-container .select2-selection .select2-selection__arrow:before,
|
||||
.um-field .select2.select2-container .select2-selection .select2-selection__arrow:before {
|
||||
content: "\f3d0" !important;
|
||||
font-size: 28px !important;
|
||||
font-family: "Ionicons" !important;
|
||||
font-weight: normal;
|
||||
display: block;
|
||||
height: 100%;
|
||||
line-height: 40px;
|
||||
@@ -946,72 +944,82 @@ small.um-max-filesize span{
|
||||
color: #aaaaaa;
|
||||
}
|
||||
|
||||
.select2.select2-container .select2-selection .select2-selection__arrow b[role="presentation"] {
|
||||
.um-search-filter .select2.select2-container .select2-selection .select2-selection__arrow b[role="presentation"],
|
||||
.um-field .select2.select2-container .select2-selection .select2-selection__arrow b[role="presentation"] {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.select2-container.select2-container--open .select2-dropdown {
|
||||
.um-search-filter .select2-container.select2-container--open .select2-dropdown,
|
||||
.um-field .select2-container.select2-container--open .select2-dropdown {
|
||||
border: 1px solid #ddd !important;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
.select2-container.select2-container--open .select2-dropdown .select2-results li {
|
||||
.um-search-filter .select2-container.select2-container--open .select2-dropdown .select2-results li,
|
||||
.um-field .select2-container.select2-container--open .select2-dropdown .select2-results li {
|
||||
list-style: none;
|
||||
display: list-item;
|
||||
background-image: none;
|
||||
background: none;
|
||||
font-size: 15px;
|
||||
margin: 5px !important;
|
||||
color: #666 !important;
|
||||
padding: 3px 7px 4px !important;
|
||||
cursor: pointer;
|
||||
min-height: 1em !important;
|
||||
min-height: 1em;
|
||||
}
|
||||
|
||||
.select2.select2-container .select2-selection.select2-selection--multiple {
|
||||
.um-search-filter .select2.select2-container .select2-selection.select2-selection--multiple,
|
||||
.um-field .select2.select2-container .select2-selection.select2-selection--multiple {
|
||||
height: auto !important;
|
||||
line-height: 0.8 !important;
|
||||
min-height: 40px;
|
||||
padding-bottom: 4px !important;
|
||||
}
|
||||
|
||||
.select2-container--default .select2-selection--single .select2-selection__rendered {
|
||||
.um-search-filter .select2-container--default .select2-selection--single .select2-selection__rendered,
|
||||
.um-field .select2-container--default .select2-selection--single .select2-selection__rendered {
|
||||
line-height: 37px;
|
||||
padding-left: 0 !important;
|
||||
padding-right: 24px !important;
|
||||
padding-left: 0px;
|
||||
padding-right: 24px;
|
||||
}
|
||||
.rtl .select2-container--default .select2-selection--single .select2-selection__rendered {
|
||||
padding-left: 24px !important;
|
||||
padding-right: 0 !important;
|
||||
.rtl .um-search-filter .select2-container--default .select2-selection--single .select2-selection__rendered,
|
||||
.rtl .um-field .select2-container--default .select2-selection--single .select2-selection__rendered {
|
||||
padding-left: 24px;
|
||||
padding-right: 0px;
|
||||
}
|
||||
|
||||
.select2-container--default .select2-selection--multiple .select2-selection__rendered {
|
||||
.um-search-filter .select2-container--default .select2-selection--multiple .select2-selection__rendered,
|
||||
.um-field .select2-container--default .select2-selection--multiple .select2-selection__rendered {
|
||||
line-height: 37px;
|
||||
box-sizing: border-box;
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding-left: 0 !important;
|
||||
padding-left: 0px;
|
||||
padding-right: 30px;
|
||||
width: 100%;
|
||||
font-size: 13px;
|
||||
}
|
||||
.rtl .select2-container--default .select2-selection--multiple .select2-selection__rendered {
|
||||
padding-left: 30px !important;
|
||||
padding-right: 0 !important;
|
||||
.rtl .um-search-filter .select2-container--default .select2-selection--multiple .select2-selection__rendered,
|
||||
.rtl .um-field .select2-container--default .select2-selection--multiple .select2-selection__rendered {
|
||||
padding-left: 30px;
|
||||
padding-right: 0px;
|
||||
}
|
||||
|
||||
.select2-results li.select2-results__option.select2-results__option--highlighted {
|
||||
background: none !important;
|
||||
background: #f4f4f4 !important;
|
||||
color: #666 !important;
|
||||
.um-search-filter .select2-dropdown .select2-results li.select2-results__option.select2-results__option--highlighted,
|
||||
.um-field .select2-dropdown .select2-results li.select2-results__option.select2-results__option--highlighted {
|
||||
background: #f4f4f4;
|
||||
color: #666;
|
||||
}
|
||||
.select2-container--default .select2-results__option[aria-selected="true"] {
|
||||
.um-search-filter .select2-dropdown .select2-results li.select2-results__option[aria-selected="true"],
|
||||
.um-field .select2-dropdown .select2-results li.select2-results__option[aria-selected="true"] {
|
||||
background-color: #ddd;
|
||||
}
|
||||
|
||||
|
||||
.select2-container--default .select2-selection--single .select2-selection__clear,
|
||||
.select2-container--default .select2-selection--multiple .select2-selection__clear {
|
||||
color: #aaaaaa !important;
|
||||
.um-search-filter .select2-container--default .select2-selection--single .select2-selection__clear,
|
||||
.um-search-filter .select2-container--default .select2-selection--multiple .select2-selection__clear,
|
||||
.um-field .select2-container--default .select2-selection--single .select2-selection__clear,
|
||||
.um-field .select2-container--default .select2-selection--multiple .select2-selection__clear {
|
||||
color: #aaaaaa;
|
||||
font-size: 28px;
|
||||
font-weight: normal;
|
||||
line-height: 34px;
|
||||
@@ -1020,42 +1028,50 @@ small.um-max-filesize span{
|
||||
text-align: center;
|
||||
width: 1em;
|
||||
}
|
||||
.rtl .select2-container--default .select2-selection--single .select2-selection__clear,
|
||||
.rtl .select2-container--default .select2-selection--multiple .select2-selection__clear {
|
||||
.rtl .um-search-filter .select2-container--default .select2-selection--single .select2-selection__clear,
|
||||
.rtl .um-search-filter .select2-container--default .select2-selection--multiple .select2-selection__clear,
|
||||
.rtl .um-field .select2-container--default .select2-selection--single .select2-selection__clear,
|
||||
.rtl .um-field .select2-container--default .select2-selection--multiple .select2-selection__clear {
|
||||
left: 0;
|
||||
right: initial;
|
||||
}
|
||||
|
||||
.select2-container--default .select2-selection--multiple .select2-selection__clear {
|
||||
.um-search-filter .select2-container--default .select2-selection--multiple .select2-selection__clear,
|
||||
.um-field .select2-container--default .select2-selection--multiple .select2-selection__clear {
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
.select2-container--default .select2-selection--multiple .select2-selection__choice {
|
||||
.um-search-filter .select2-container--default .select2-selection--multiple .select2-selection__choice,
|
||||
.um-field .select2-container--default .select2-selection--multiple .select2-selection__choice {
|
||||
margin: 5px 5px 0 0;
|
||||
max-height: 28px;
|
||||
padding: 3px 3px 3px 5px;
|
||||
}
|
||||
.rtl .select2-container--default .select2-selection--multiple .select2-selection__choice{
|
||||
.rtl .um-search-filter .select2-container--default .select2-selection--multiple .select2-selection__choice,
|
||||
.rtl .um-field .select2-container--default .select2-selection--multiple .select2-selection__choice {
|
||||
margin: 5px 0 0 5px;
|
||||
max-height: 28px;
|
||||
padding: 3px 5px 3px 3px;
|
||||
}
|
||||
|
||||
.um .um-form .select2-container .select2-search.select2-search--inline{
|
||||
.um-search-filter .select2-container--default .select2-selection--multiple .select2-search.select2-search--inline,
|
||||
.um-field .select2-container--default .select2-selection--multiple .select2-search.select2-search--inline {
|
||||
margin: 5px 5px 0 0;
|
||||
padding: 0px;
|
||||
}
|
||||
.rtl .um .um-form .select2-container .select2-search.select2-search--inline{
|
||||
.rtl .um-search-filter .select2-container--default .select2-selection--multiple .select2-search.select2-search--inline,
|
||||
.rtl .um-field .select2-container--default .select2-selection--multiple .select2-search.select2-search--inline {
|
||||
margin: 5px 0 0 5px;
|
||||
}
|
||||
|
||||
.um .um-form .select2-container .select2-search.select2-search--inline > input {
|
||||
.um-search-filter .select2-container--default .select2-selection--multiple .select2-search.select2-search--inline > input,
|
||||
.um-field .select2-container--default .select2-selection--multiple .select2-search.select2-search--inline > input {
|
||||
border: none !important;
|
||||
padding: 0 !important;
|
||||
border-radius: 0 !important;
|
||||
max-height: 28px;
|
||||
}
|
||||
|
||||
.um .um-form .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
|
||||
.um-search-filter .select2-container--default .select2-selection--multiple .select2-selection__rendered li,
|
||||
.um-field .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
|
||||
overflow-x: hidden;
|
||||
text-overflow: ellipsis;
|
||||
max-width: 100%;
|
||||
@@ -1066,31 +1082,8 @@ small.um-max-filesize span{
|
||||
/*
|
||||
- Multi-select
|
||||
*/
|
||||
/*.um-field .select2-selection--multiple .select2-search{*/
|
||||
/*clear: both;*/
|
||||
/*float: none;*/
|
||||
/*margin-right: 12px;*/
|
||||
/*padding-top: 0.5rem;*/
|
||||
/*position: relative;*/
|
||||
/*}*/
|
||||
/*.um-field .select2-selection--multiple .select2-search:first-of-type{*/
|
||||
/*padding-top: 12px;*/
|
||||
/*}*/
|
||||
/*.um-field .select2-selection--multiple .select2-search::before {*/
|
||||
/*content: "\f21f";*/
|
||||
/*font-family: "Ionicons";*/
|
||||
/*font-size: 1.4rem;*/
|
||||
/*line-height: 2rem;*/
|
||||
/*right: 0.3rem;*/
|
||||
/*position: absolute;*/
|
||||
/*}*/
|
||||
/*.um-field .select2-selection--multiple .select2-search input.select2-search__field{*/
|
||||
/*background-color: rgba(128,128,128,0.1) !important;*/
|
||||
/*height: 2rem !important;*/
|
||||
/*width: 100% !important;*/
|
||||
/*}*/
|
||||
|
||||
/* @todo maybe deprecated and used only for select and multiselect */
|
||||
/* @todo maybe deprecated and used only for select and multiselect */
|
||||
.um-field-select .um-field-area .um-field-icon,
|
||||
.um-field-multiselect .um-field-area .um-field-icon {
|
||||
z-index: 99999999;
|
||||
|
||||
+8
-1
@@ -10,7 +10,14 @@
|
||||
"woocommerce/action-scheduler": "3.2.1"
|
||||
},
|
||||
"require-dev": {
|
||||
"roave/security-advisories": "dev-master"
|
||||
"roave/security-advisories": "dev-master",
|
||||
"wp-cli/wp-cli": "*",
|
||||
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
|
||||
"object-calisthenics/phpcs-calisthenics-rules": "*",
|
||||
"phpcompatibility/phpcompatibility-wp": "*",
|
||||
"wp-coding-standards/wpcs": "2.3.0",
|
||||
"squizlabs/php_codesniffer": "3.*",
|
||||
"phpdocumentor/phpdocumentor": "3.1.*"
|
||||
},
|
||||
"extra": {
|
||||
"installer-paths": {
|
||||
|
||||
@@ -308,7 +308,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
|
||||
// Admin filtering
|
||||
$directory_search_filters = get_post_meta( $directory_id, '_um_search_filters', true );
|
||||
unset( $directory_search_filters[ $id ] );
|
||||
if ( isset( $directory_search_filters[ $id ] ) ) {
|
||||
unset( $directory_search_filters[ $id ] );
|
||||
}
|
||||
update_post_meta( $directory_id, '_um_search_filters', $directory_search_filters );
|
||||
|
||||
// display in tagline
|
||||
@@ -4487,7 +4489,15 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
}
|
||||
|
||||
if ( um_is_myprofile() ) {
|
||||
$output .= '<p class="um-profile-note">' . $emo . '<span>' . sprintf( __( 'Your profile is looking a little empty. Why not <a href="%s">add</a> some information!', 'ultimate-member' ), esc_url( um_edit_profile_url() ) ) . '</span></p>';
|
||||
if ( isset( $_GET['profiletab'] ) && 'main' !== $_GET['profiletab'] ) {
|
||||
$tab = sanitize_key( $_GET['profiletab'] );
|
||||
$edit_action = 'edit_' . $tab;
|
||||
$profile_url = um_user_profile_url( um_profile_id() );
|
||||
$edit_url = add_query_arg( array( 'profiletab' => $tab, 'um_action' => $edit_action ), $profile_url );
|
||||
} else {
|
||||
$edit_url = um_edit_profile_url();
|
||||
}
|
||||
$output .= '<p class="um-profile-note">' . $emo . '<span>' . sprintf( __( 'Your profile is looking a little empty. Why not <a href="%s">add</a> some information!', 'ultimate-member' ), esc_url( $edit_url ) ) . '</span></p>';
|
||||
} else {
|
||||
$output .= '<p class="um-profile-note">' . $emo . '<span>' . __( 'This user has not added any information to their profile yet.', 'ultimate-member' ) . '</span></p>';
|
||||
}
|
||||
|
||||
@@ -446,7 +446,16 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
|
||||
|
||||
$blog_id = get_current_blog_id();
|
||||
|
||||
$directory_id = $this->get_directory_by_hash( $_POST['directory_id'] );
|
||||
if ( empty( $_POST['directory_id'] ) ) {
|
||||
wp_send_json_error( __( 'Wrong member directory data', 'ultimate-member' ) );
|
||||
}
|
||||
|
||||
$directory_id = $this->get_directory_by_hash( sanitize_key( $_POST['directory_id'] ) );
|
||||
|
||||
if ( empty( $directory_id ) ) {
|
||||
wp_send_json_error( __( 'Wrong member directory data', 'ultimate-member' ) );
|
||||
}
|
||||
|
||||
$directory_data = UM()->query()->post_data( $directory_id );
|
||||
|
||||
//predefined result for user without capabilities to see other members
|
||||
|
||||
@@ -2465,7 +2465,16 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
|
||||
|
||||
global $wpdb;
|
||||
|
||||
if ( empty( $_POST['directory_id'] ) ) {
|
||||
wp_send_json_error( __( 'Wrong member directory data', 'ultimate-member' ) );
|
||||
}
|
||||
|
||||
$directory_id = $this->get_directory_by_hash( sanitize_key( $_POST['directory_id'] ) );
|
||||
|
||||
if ( empty( $directory_id ) ) {
|
||||
wp_send_json_error( __( 'Wrong member directory data', 'ultimate-member' ) );
|
||||
}
|
||||
|
||||
$directory_data = UM()->query()->post_data( $directory_id );
|
||||
|
||||
//predefined result for user without capabilities to see other members
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0"?>
|
||||
<ruleset name="Ultimate Member CS">
|
||||
|
||||
<description>Best practices Ultimate Member Coding Standards</description>
|
||||
<config name="testVersion" value="5.6-"/>
|
||||
|
||||
<arg value="ps"/>
|
||||
<arg name="colors"/>
|
||||
<arg name="parallel" value="100"/>
|
||||
<arg name="extensions" value="php"/>
|
||||
<arg name="cache" value=".phpcs.cache"/>
|
||||
|
||||
<exclude-pattern>\.github/*</exclude-pattern>
|
||||
<exclude-pattern>vendor/*</exclude-pattern>
|
||||
<exclude-pattern>node_modules/*</exclude-pattern>
|
||||
<exclude-pattern>documentor/*</exclude-pattern>
|
||||
<exclude-pattern>\.idea/*</exclude-pattern>
|
||||
|
||||
<rule ref="WordPress-Extra"/>
|
||||
|
||||
<rule ref="PHPCompatibilityWP">
|
||||
<include-pattern>*\.php$</include-pattern>
|
||||
</rule>
|
||||
|
||||
</ruleset>
|
||||
+10
-1
@@ -7,7 +7,7 @@ Tags: community, member, membership, user-profile, user-registration
|
||||
Requires PHP: 5.6
|
||||
Requires at least: 5.0
|
||||
Tested up to: 6.0
|
||||
Stable tag: 2.4.1
|
||||
Stable tag: 2.4.2
|
||||
License: GNU Version 2 or Any Later Version
|
||||
License URI: http://www.gnu.org/licenses/gpl-3.0.txt
|
||||
|
||||
@@ -163,6 +163,15 @@ No, you do not need to use our plugin’s login or registration pages and can us
|
||||
* To learn more about version 2.1 please see this [docs](https://docs.ultimatemember.com/article/1512-upgrade-2-1-0)
|
||||
* UM2.1+ is a significant update to the Member Directories' code base from 2.0.x. Please make sure you take a full-site backup with restore point before updating the plugin
|
||||
|
||||
= 2.4.2: July 14, 2022 =
|
||||
|
||||
* Bugfixes:
|
||||
|
||||
- Fixed: Member Directory vulnerabilities
|
||||
- Fixed: 3rd-party integration with profile tabs and ability to show edit profile form on the 3rd-party profile tab
|
||||
- Fixed: PHP fatal error on unset
|
||||
- Fixed: select2 style conflicts with 3rd-party plugins
|
||||
|
||||
= 2.4.1: June 13, 2022 =
|
||||
|
||||
* Enhancements:
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
Plugin Name: Ultimate Member
|
||||
Plugin URI: http://ultimatemember.com/
|
||||
Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress
|
||||
Version: 2.4.1
|
||||
Version: 2.4.2
|
||||
Author: Ultimate Member
|
||||
Author URI: http://ultimatemember.com/
|
||||
Text Domain: ultimate-member
|
||||
|
||||
Reference in New Issue
Block a user