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.65

Browse Source
This commit is contained in:
ultimatemember
2015-02-24 18:30:11 +02:00
parent e341d4e965
commit 34d7192436
11 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/core/um-admin-metabox.php
+3
View File
@@ -373,6 +373,9 @@ class UM_Admin_Metabox {
delete_post_meta( $post_id, '_um_can_view_roles' );
delete_post_meta( $post_id, '_um_can_edit_roles' );
delete_post_meta( $post_id, '_um_can_delete_roles' );
do_action('um_admin_before_saving_role_meta', $post_id );
foreach( $_POST as $k => $v ) {
if (strstr($k, '_um_')){
update_post_meta( $post_id, $k, $v);
assets/css/um-profile.css
+1 -1
View File
@@ -18,7 +18,7 @@
display: none;
}
.um-profile img {display: block;overflow:hidden;border-radius:0;margin: 0}
.um-profile img {display: block;overflow:hidden;border-radius:0;margin: 0 !important}
.um-profile a,
.um-profile a:hover {text-decoration:none !important}
assets/css/um.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
core/um-actions-access.php
+7 -3
View File
@@ -37,15 +37,19 @@
if ( $exclude_uris ) {
$redirects = array_merge( $redirects, $exclude_uris );
}
$redirects = array_unique( $redirects );
$current_url = $ultimatemember->permalinks->get_current_url( get_option('permalink_structure') );
$current_url = untrailingslashit( $current_url );
$current_url_slash = trailingslashit( $current_url );
if ( ( isset( $post->ID ) || is_home() ) && in_array( $current_url, $redirects ) ) {
// allow
if ( ( isset( $post->ID ) || is_home() ) && ( in_array( $current_url, $redirects ) || in_array( $current_url_slash, $redirects ) ) ) {
// allow
} else {
$ultimatemember->access->redirect_handler = $redirect;
}
}
}
core/um-actions-login.php
+11 -2
View File
@@ -172,6 +172,15 @@
// DO NOT add when reviewing user's details
if ( $ultimatemember->user->preview == true && is_admin() ) return;
$primary_btn_word = $args['primary_btn_word'];
$primary_btn_word = apply_filters('um_login_form_button_one', $primary_btn_word);
$secondary_btn_word = $args['secondary_btn_word'];
$secondary_btn_word = apply_filters('um_login_form_button_two', $secondary_btn_word);
$secondary_btn_url = ( isset( $args['secondary_btn_url'] ) && $args['secondary_btn_url'] ) ? $args['secondary_btn_url'] : um_get_core_page('register');
$secondary_btn_url = apply_filters('um_login_form_button_two_url', $secondary_btn_url);
?>
<div class="um-col-alt">
@@ -182,8 +191,8 @@
<?php if ( isset($args['secondary_btn']) && $args['secondary_btn'] != 0 ) { ?>
<div class="um-left um-half"><input type="submit" value="<?php echo $args['primary_btn_word']; ?>" class="um-button" /></div>
<div class="um-right um-half"><a href="<?php echo um_get_core_page('register'); ?>" class="um-button um-alt"><?php echo $args['secondary_btn_word']; ?></a></div>
<div class="um-left um-half"><input type="submit" value="<?php echo $primary_btn_word; ?>" class="um-button" /></div>
<div class="um-right um-half"><a href="<?php echo $secondary_btn_url; ?>" class="um-button um-alt"><?php echo $secondary_btn_word; ?></a></div>
<?php } else { ?>
core/um-actions-register.php
+4 -1
View File
@@ -242,6 +242,9 @@
$secondary_btn_word = $args['secondary_btn_word'];
$secondary_btn_word = apply_filters('um_register_form_button_two', $secondary_btn_word);
$secondary_btn_url = ( isset( $args['secondary_btn_url'] ) && $args['secondary_btn_url'] ) ? $args['secondary_btn_url'] : um_get_core_page('login');
$secondary_btn_url = apply_filters('um_register_form_button_two_url', $secondary_btn_url);
?>
<div class="um-col-alt">
@@ -249,7 +252,7 @@
<?php if ( isset($args['secondary_btn']) && $args['secondary_btn'] != 0 ) { ?>
<div class="um-left um-half"><input type="submit" value="<?php echo $primary_btn_word; ?>" class="um-button" /></div>
<div class="um-right um-half"><a href="<?php echo um_get_core_page('login'); ?>" class="um-button um-alt"><?php echo $secondary_btn_word; ?></a></div>
<div class="um-right um-half"><a href="<?php echo $secondary_btn_url; ?>" class="um-button um-alt"><?php echo $secondary_btn_word; ?></a></div>
<?php } else { ?>
core/um-setup.php
+2
View File
@@ -134,6 +134,7 @@ class UM_Setup {
'_um_register_secondary_btn_color' => '#eee',
'_um_register_secondary_btn_hover' => '#e5e5e5',
'_um_register_secondary_btn_text' => '#666',
'_um_register_secondary_btn_url' => '',
'_um_login_template' => 'login',
'_um_login_max_width' => '450px',
'_um_login_align' => 'center',
@@ -149,6 +150,7 @@ class UM_Setup {
'_um_login_secondary_btn_color' => '#eee',
'_um_login_secondary_btn_hover' => '#e5e5e5',
'_um_login_secondary_btn_text' => '#666',
'_um_login_secondary_btn_url' => '',
'_um_directory_template' => 'members',
'_um_directory_header' => __('{total_users} Members','ultimatemember'),
'_um_directory_header_single' => __('{total_users} Member','ultimatemember'),
index.php
+1 -1
View File
@@ -3,7 +3,7 @@
Plugin Name: Ultimate Member
Plugin URI: http://ultimatemember.com/
Description: Ultimate Member is a powerful community and membership plugin that allows you to create beautiful community and membership sites with WordPress
Version: 1.0.64
Version: 1.0.65
Author: Ultimate Member
Author URI: http://ultimatemember.com/
*/
readme.txt
+9 -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.64
Stable Tag: 1.0.65
License: GNU Version 2 or Any Later Version
@@ -189,6 +189,14 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
== Changelog ==
= 1.0.65: February 24, 2015 =
* New: added option to customize register form secondary button URL
* New: added option to customize login form secondary button URL
* Fixed: issue with global access lock when homepage is excluded
* Fixed: issue with custom account tabs
* Fixed: minor css conflict with profile photo
= 1.0.64: February 22, 2015 =
* Tweak: updated language files on server
templates/account.php
+1 -1
View File
@@ -28,7 +28,7 @@
$current_tab = $ultimatemember->account->current_tab;
if ( um_get_option('account_tab_'.$id ) == 1 || $id == 'general' ) {
if ( isset($info['custom']) || um_get_option('account_tab_'.$id ) == 1 || $id == 'general' ) {
?>
um-config.php
+18
View File
@@ -1541,6 +1541,15 @@ $this->sections[] = array(
'required' => array( 'register_secondary_btn', '=', 1 ),
),
array(
'id' => 'register_secondary_btn_url',
'type' => 'text',
'title' => __( 'Registration Secondary Button URL','ultimatemember' ),
'default' => um_get_metadefault('register_secondary_btn_url'),
'desc' => __('You can replace default link for this button by entering custom URL','ultimatemember'),
'required' => array( 'login_secondary_btn', '=', 1 ),
),
array(
'id' => 'register_role',
'type' => 'select',
@@ -1634,6 +1643,15 @@ $this->sections[] = array(
'required' => array( 'login_secondary_btn', '=', 1 ),
),
array(
'id' => 'login_secondary_btn_url',
'type' => 'text',
'title' => __( 'Login Secondary Button URL','ultimatemember' ),
'default' => um_get_metadefault('login_secondary_btn_url'),
'desc' => __('You can replace default link for this button by entering custom URL','ultimatemember'),
'required' => array( 'login_secondary_btn', '=', 1 ),
),
array(
'id' => 'login_forgot_pass_link',
'type' => 'switch',