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

Merge branch 'master' of https://github.com/ultimatemember/ultimatemember

Browse Source
This commit is contained in:
yura_nalivaiko
2018-05-07 10:31:57 +03:00
parent ea198fde81 0b21ba4139
commit f7a9ab2785
9 changed files with 79 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/um-profile.css
-6
View File
@@ -545,10 +545,4 @@ font-weight: normal;
.um-profile.um-viewing .um-field-checkbox, .um-profile.um-viewing .um-field-radio{
cursor: default !important;
}
@media (min-width: 880px) {
.um-profile-nav-item .um-tip-n {
display: none !important;
}
}
assets/css/um-responsive.css
+8
View File
@@ -6,6 +6,14 @@
display: none;
}
.um-profile-nav-item a.uimob340-show,
.um-profile-nav-item a.uimob500-show,
.um-profile-nav-item a.uimob800-show,
.um-profile-nav-item a.uimob960-show
{
display: none;
}
div.uimob340 .uimob340-show,
div.uimob500 .uimob500-show,
div.uimob800 .uimob800-show,
includes/admin/templates/form/login_customize.php
+1 -1
View File
@@ -65,7 +65,7 @@
array(
'id' => '_um_login_secondary_btn_word',
'type' => 'text',
'label' => __( 'Primary Button Text', 'ultimate-member' ),
'label' => __( 'Secondary Button Text', 'ultimate-member' ),
'tooltip' => __( 'Customize the button text', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_login_secondary_btn_word', null, UM()->options()->get( 'login_secondary_btn_word' ) ),
'conditional' => array( '_um_login_secondary_btn', '=', 1 )
includes/admin/templates/form/profile_customize.php
+1 -1
View File
@@ -90,7 +90,7 @@
array(
'id' => '_um_profile_secondary_btn_word',
'type' => 'text',
'label' => __( 'Primary Button Text', 'ultimate-member' ),
'label' => __( 'Secondary Button Text', 'ultimate-member' ),
'tooltip' => __( 'Customize the button text', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_profile_secondary_btn_word', null, UM()->options()->get( 'profile_secondary_btn_word' ) ),
'conditional' => array( '_um_profile_secondary_btn', '=', 1 )
includes/admin/templates/form/register_customize.php
+1 -1
View File
@@ -80,7 +80,7 @@
array(
'id' => '_um_register_secondary_btn_word',
'type' => 'text',
'label' => __( 'Primary Button Text', 'ultimate-member' ),
'label' => __( 'Secondary Button Text', 'ultimate-member' ),
'tooltip' => __( 'Customize the button text', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_register_secondary_btn_word', null, UM()->options()->get( 'register_secondary_btn_word' ) ),
'conditional' => array( '_um_register_secondary_btn', '=', 1 )
includes/core/class-enqueue.php
+1 -1
View File
@@ -463,7 +463,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
wp_register_script('um_responsive', um_url . 'assets/js/um-responsive' . $this->suffix . '.js' );
wp_enqueue_script('um_responsive');
wp_register_style('um_responsive', um_url . 'assets/css/um-responsive.css' );
wp_register_style('um_responsive', um_url . 'assets/css/um-responsive.css', array( 'um_profile' ) );
wp_enqueue_style('um_responsive');
}
includes/core/class-fields.php
+57 -23
View File
@@ -43,9 +43,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
<div class="um-field um-field-c">
<div class="um-field-area">
<label class="um-field-checkbox active">
<input type="checkbox" name="<?php echo $id; ?>" value="1" checked/><span
class="um-field-checkbox-state"><i
class="um-icon-android-checkbox-outline"></i></span>
<input type="checkbox" name="<?php echo $id; ?>" value="1" checked/>
<span class="um-field-checkbox-state"><i class="um-icon-android-checkbox-outline"></i></span>
<span class="um-field-checkbox-option"> <?php echo $title; ?></span>
</label>
</div>
@@ -1529,10 +1528,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
* @param string $key
* @param array $data
* @param boolean $rule
* @param array $args
*
* @return string
*/
function edit_field( $key, $data, $rule = false ) {
function edit_field( $key, $data, $rule = false, $args = array() ) {
global $_um_profile_id;
$output = null;
$disabled = '';
@@ -1566,7 +1566,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
* @var boolean $required
* @var string $validate
* @var string $default
* @var string $conditional
* @var string $conditional
*/
extract( $data );
}
@@ -1662,7 +1662,47 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
* ?>
*/
$type = apply_filters( "um_hook_for_field_{$type}", $type );
switch ( $type ) {
case 'textarea':
case 'multiselect':
$field_id = $field_name = $key;
$field_value = $this->field_value( $key, $default, $data );
break;
case 'select':
case 'radio':
$form_key = str_replace( 'role_select', 'role', $key );
$field_id = $form_key;
break;
default:
$field_id = '';
break;
}
/**
* UM hook
*
* @type filter
* @title um_completeness_field_id
* @description use for change core id not allowed duplicate
* @input_vars
* [{"var":"$field_id","type":"string","desc":"Field id"},
* {"var":"$data","type":"array","desc":"Field Data"}]
* {"var":"$args","type":"array","desc":"Optional field arguments"}]
* @change_log
* ["Since: 2.0.13"]
* @usage add_filter( 'um_completeness_field_id', 'function_name', 10, 3 );
* @example
* <?php
* add_filter( 'um_completeness_field_id', 'function_name', 10, 3 );
* function function_name( $field_id, $data, $args ) {
* // your code here
* return $field_id;
* }
* ?>
*/
$field_id = apply_filters( 'um_completeness_field_id', $field_id, $data, $args );
/* Begin by field type */
switch ( $type ) {
@@ -1721,8 +1761,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
</div>';
if (!empty( $disabled )) {
$output .= $this->disabled_hidden_field( $field_name, $field_value );
if (!empty( $disabled )) {
$output .= $this->disabled_hidden_field( $field_name, $field_value );
}
if ($this->is_error( $key )) {
@@ -2032,8 +2072,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
}
$output .= '<div class="um-field-area">';
$field_name = $key;
$field_value = $this->field_value( $key, $default, $data );
if (isset( $data['html'] ) && $data['html'] != 0 && $key != "description") {
@@ -2084,16 +2122,17 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
// add the contents of the buffer to the output variable
$output .= ob_get_clean();
} else $output .= '<textarea ' . $disabled . ' style="height: ' . $height . ';" class="' . $this->get_class( $key, $data ) . '" name="' . $key . '" id="' . $key . '" placeholder="' . $placeholder . '">' . $field_value . '</textarea>';
} else {
$output .= '<textarea ' . $disabled . ' style="height: ' . $height . ';" class="' . $this->get_class( $key, $data ) . '" name="' . $field_name . '" id="' . $field_id . '" placeholder="' . $placeholder . '">' . $field_value . '</textarea>';
}
$output .= '
</div>';
$output .= '</div>';
if (!empty( $disabled )) {
if ( ! empty( $disabled ) ) {
$output .= $this->disabled_hidden_field( $field_name, $field_value );
}
if ($this->is_error( $key )) {
if ( $this->is_error( $key ) ) {
$output .= $this->field_error( $this->show_error( $key ) );
}
@@ -2111,7 +2150,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$output .= '<div class="um-field-area">';
$output .= '<div class="um-rating um-raty" id="' . $key . '" data-key="' . $key . '" data-number="' . $data['number'] . '" data-score="' . $this->field_value( $key, $default, $data ) . '"></div>';
$output .= '</div>';
$output .= '</div>';
@@ -2313,8 +2351,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
/* Select dropdown */
case 'select':
$form_key = str_replace( 'role_select', 'role', $key );
$output .= '<div class="um-field' . $classes . '"' . $conditional . ' data-key="' . $key . '">';
@@ -2434,10 +2470,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
}
if( ! empty( $placeholder ) ) {
$placeholder = strip_tags( $placeholder );
}
$placeholder = strip_tags( $placeholder );
}
$output .= '<select ' . $disabled . ' ' . $select_original_option_value . ' ' . $disabled_by_parent_option . ' name="' . $form_key . '" id="' . $form_key . '" data-validate="' . $validate . '" data-key="' . $key . '" class="' . $this->get_class( $key, $data, $class ) . '" style="width: 100%" data-placeholder="' . $placeholder . '" ' . $atts_ajax . '>';
$output .= '<select ' . $disabled . ' ' . $select_original_option_value . ' ' . $disabled_by_parent_option . ' name="' . $form_key . '" id="' . $field_id . '" data-validate="' . $validate . '" data-key="' . $key . '" class="' . $this->get_class( $key, $data, $class ) . '" style="width: 100%" data-placeholder="' . $placeholder . '" ' . $atts_ajax . '>';
/**
* UM hook
@@ -2631,7 +2667,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$output .= '<div class="um-field-icon"><i class="' . $icon . '"></i></div>';
}
$output .= '<select ' . $disabled . ' multiple="multiple" name="' . $key . '[]" id="' . $key . '" data-maxsize="' . $max_selections . '" data-validate="' . $validate . '" data-key="' . $key . '" class="' . $this->get_class( $key, $data, $class ) . ' um-user-keyword_' . $use_keyword . '" style="width: 100%" data-placeholder="' . $placeholder . '">';
$output .= '<select ' . $disabled . ' multiple="multiple" name="' . $field_name . '[]" id="' . $field_id . '" data-maxsize="' . $max_selections . '" data-validate="' . $validate . '" data-key="' . $key . '" class="' . $this->get_class( $key, $data, $class ) . ' um-user-keyword_' . $use_keyword . '" style="width: 100%" data-placeholder="' . $placeholder . '">';
if ( isset( $options ) && $options == 'builtin' ) {
@@ -2768,8 +2804,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
/* Radio */
case 'radio':
$form_key = str_replace( 'role_radio', 'role', $key );
if ( isset( $options ) ) {
/**
* UM hook
readme.txt
+9 -1
View File
@@ -6,7 +6,7 @@ Donate link:
Tags: community, member, membership, user-profile, user-registration
Requires at least: 4.1
Tested up to: 4.9
Stable tag: 2.0.12
Stable tag: 2.0.13
License: GNU Version 2 or Any Later Version
License URI: http://www.gnu.org/licenses/gpl-3.0.txt
@@ -131,6 +131,14 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
= Important: UM2.0+ is a significant update to the code base from 1.3.88. Please make sure you take a full-site backup with restore point before updating the plugin =
= 2.0.13: May 2, 2018 =
* Bugfixes:
- Fixed and optimized user avatars
- Fixed Profile Menu on some installs
- Fixed fields IDs duplicates
- Fixed cache users count
= 2.0.12: April 30, 2018 =
* Bugfixes:
ultimate-member.php
+1 -1
View File
@@ -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.0.12
Version: 2.0.13
Author: Ultimate Member
Author URI: http://ultimatemember.com/
Text Domain: ultimate-member