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

Update 1.0.70

Browse Source
This commit is contained in:
ultimatemember
2015-03-02 16:46:00 +02:00
parent 6d4ff64995
commit 832db67584
15 changed files with 94 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/assets/css/um-admin-redux.css
+4
View File
@@ -49,6 +49,10 @@
background: none !important;
}
.redux-container-sortable .checkbox-container input {
display: none;
}
#redux-header {
background: #3ba1da !important;
border-color: #3ba1da !important;
admin/core/um-admin-metabox.php
+2 -3
View File
@@ -24,12 +24,11 @@ class UM_Admin_Metabox {
***/
function remove_rewrite_rules_option( $post_id ) {
if ( ! wp_is_post_revision( $post_id ) ) {
if ( get_post_meta($post_id, '_um_core', true) ) {
flush_rewrite_rules( true ); // so they reset rewrite rules
delete_option('um_flush_rules');
}
}
}
assets/css/um-responsive.css
+45
View File
@@ -234,6 +234,21 @@ div.uimob340 .um-account-main {
box-sizing: border-box;
}
div.uimob340 .um-account-main .um-provider {
padding: 15px 0 0 0;
}
div.uimob340 .um-account-main .um-left {
float: none;
display: block;
}
div.uimob340 .um-account-main .um-right {
float: none;
display: block;
margin-top: 10px;
}
div.uimob340 .um-account-tab {
padding-bottom: 20px;
border-bottom: 1px solid #eee;
@@ -456,6 +471,21 @@ div.uimob500 .um-account-main {
box-sizing: border-box;
}
div.uimob500 .um-account-main .um-provider {
padding: 15px 0 0 0;
}
div.uimob500 .um-account-main .um-left {
float: none;
display: block;
}
div.uimob500 .um-account-main .um-right {
float: none;
display: block;
margin-top: 10px;
}
div.uimob500 .um-account-tab {
padding-bottom: 20px;
border-bottom: 1px solid #eee;
@@ -503,6 +533,21 @@ div.uimob800 .um-account-main {
max-width: 450px;
}
div.uimob800 .um-account-main .um-provider {
padding: 15px 0 0 0;
}
div.uimob800 .um-account-main .um-left {
float: none;
display: block;
}
div.uimob800 .um-account-main .um-right {
float: none;
display: block;
margin-top: 10px;
}
div.uimob800 .um-account-side {
padding: 0;
width: 10%;
assets/css/um.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
core/um-actions-form.php
+1 -1
View File
@@ -161,7 +161,7 @@
if ( $key == 'role_select' || $key == 'role_radio' ) {
if ( isset($args['role']) && empty($args['role']) && isset( $array['required'] ) && $array['required'] == 1 ) {
$ultimatemember->form->add_error($key, __('Please specify account type.','ultimatemember') );
$ultimatemember->form->add_error('role', __('Please specify account type.','ultimatemember') );
}
}
core/um-datetime.php
+1
View File
@@ -17,6 +17,7 @@ class UM_DateTime {
*** @Get age
***/
function get_age($then) {
if ( !$then ) return '';
$then_ts = strtotime($then);
$then_year = date('Y', $then_ts);
$age = date('Y') - $then_year;
core/um-fields.php
+5 -5
View File
@@ -347,7 +347,7 @@ class UM_Fields {
function field_value( $key, $default = false, $data = null ) {
global $ultimatemember;
if ( isset($_SESSION) && isset($_SESSION['um_social_profile'][$key]) )
if ( isset($_SESSION) && isset($_SESSION['um_social_profile'][$key]) && isset( $this->set_mode ) && $this->set_mode == 'register' )
return $_SESSION['um_social_profile'][$key];
$type = (isset($data['type']))?$data['type']:'';
@@ -1427,8 +1427,8 @@ class UM_Fields {
$output .= '</div>';
if ( $this->is_error($key) ) {
$output .= $this->field_error( $this->show_error($key) );
if ( $this->is_error($form_key) ) {
$output .= $this->field_error( $this->show_error($form_key) );
}
$output .= '</div>';
@@ -1566,8 +1566,8 @@ class UM_Fields {
$output .= '</div>';
if ( $this->is_error($key) ) {
$output .= $this->field_error( $this->show_error($key) );
if ( $this->is_error($form_key) ) {
$output .= $this->field_error( $this->show_error($form_key) );
}
$output .= '</div>';
core/um-rewrite.php
+4 -2
View File
@@ -6,7 +6,7 @@ class UM_Rewrite {
add_filter('query_vars', array(&$this, 'query_vars'), 10, 1 );
add_action('init', array(&$this, 'rewrite_rules'), 1 );
add_action('init', array(&$this, 'rewrite_rules'), 100000000 );
add_action('template_redirect', array(&$this, 'redirect_author_page'), 9999 );
@@ -29,7 +29,7 @@ class UM_Rewrite {
*** @setup rewrite rules
***/
function rewrite_rules(){
global $ultimatemember;
if ( isset( $ultimatemember->permalinks->core['user'] ) ) {
@@ -60,6 +60,8 @@ class UM_Rewrite {
update_option('um_flush_rules', true);
}
flush_rewrite_rules( true );
}
}
core/um-short-functions.php
+2
View File
@@ -1037,6 +1037,8 @@ function um_user( $data, $attrs = null ) {
} else {
$avatar_uri = um_get_default_avatar_uri();
}
$avatar_uri = apply_filters('um_user_avatar_url_filter', $avatar_uri, um_user('ID') );
if ( $avatar_uri )
return '<img src="' . $avatar_uri . '" class="gravatar avatar avatar-'.$attrs.' um-avatar" width="'.$attrs.'" height="'.$attrs.'" alt="" />';
core/um-shortcodes.php
+2 -2
View File
@@ -200,7 +200,7 @@ class UM_Shortcodes {
$paths[] = glob( um_path . 'templates/' . '*.php');
if ( file_exists( get_stylesheet_directory() . '/ultimate-member/templates/' ) ) {
$paths[] = glob( get_stylesheet_directory() . '/ultimate-member/templates/' . '*.php');
$paths[] = glob( get_stylesheet_directory() . '/ultimate-member/templates/' . '*.php' );
}
foreach($paths as $k => $files){
@@ -218,7 +218,7 @@ class UM_Shortcodes {
T_DOC_COMMENT // PHPDoc comments
);
foreach( $tokens as $token ) {
if( in_array($token[0], $comment) && $clean_filename != $excluded ) {
if( in_array($token[0], $comment) && strstr( $token[1], '/* Template:' ) && $clean_filename != $excluded ) {
$txt = $token[1];
$txt = str_replace('/* Template: ','',$txt);
$txt = str_replace(' */','',$txt);
core/um-user.php
+2 -2
View File
@@ -223,7 +223,7 @@ class UM_User {
function password_reset_hash(){
global $ultimatemember;
$this->profile['reset_pass_hash'] = $ultimatemember->validation->generate(30);
$this->profile['reset_pass_hash'] = $ultimatemember->validation->generate();
$this->update_usermeta_info('reset_pass_hash');
}
@@ -236,7 +236,7 @@ class UM_User {
do_action('um_before_user_hash_is_changed');
$this->profile['account_secret_hash'] = $ultimatemember->validation->generate(30);
$this->profile['account_secret_hash'] = $ultimatemember->validation->generate();
$this->update_usermeta_info('account_secret_hash');
do_action('um_after_user_hash_is_changed');
core/um-validation.php
+2 -2
View File
@@ -129,8 +129,8 @@ class UM_Validation {
/***
*** @generate a password, hash, or similar
***/
function generate( $length = 12 ) {
return wp_generate_password($length, false);
function generate( $length = 40 ) {
return wp_generate_password( $length, false );
}
/***
index.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: 1.0.69
Version: 1.0.70
Author: Ultimate Member
Author URI: http://ultimatemember.com/
*/
readme.txt
+11 -1
View File
@@ -7,7 +7,7 @@ Tags: access control, author, authors, author profile, comments, community, comm
Requires at least: 4.1
Tested up to: 4.1.1
Stable Tag: 1.0.69
Stable Tag: 1.0.70
License: GNU Version 2 or Any Later Version
@@ -189,6 +189,16 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
== Changelog ==
= 1.0.70: March 2, 2015 =
* Tweak: added a filter hook to control profile photo url
* Tweak: harder random generated passwords by making the length 40 characters for a key/password
* Tweak: added option to enable/disable custom css tab (off by default)
* Tweak: changed rewrite rules to be compatible with some themes and plugins
* Fixed: bug with Role field not showing error when required and left empty
* Fixed: bug with showing incorrect age when users did not fill their age
* Fixed: issue with template name for custom profile templates
= 1.0.69: February 28, 2015 =
* Tweak: better WP logout handling
um-config.php
+11
View File
@@ -1684,6 +1684,7 @@ $this->sections[] = array(
);
if ( um_get_option('enable_custom_css') ) {
$this->sections[] = array(
'subsection' => true,
@@ -1701,6 +1702,7 @@ $this->sections[] = array(
)
);
}
/***
*** @
@@ -1767,6 +1769,15 @@ $this->sections[] = array(
'add_text' => __('Add New Page','ultimatemember'),
),
array(
'id' => 'enable_custom_css',
'type' => 'switch',
'title' => __( 'Enable custom css tab?','ultimatemember' ),
'default' => 0,
'on' => __('On','ultimatemember'),
'off' => __('Off','ultimatemember'),
),
array(
'id' => 'allow_tracking',
'type' => 'switch',