10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-19 14:43:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #251 from nikitasinelnikov/master

Browse Source
This commit is contained in:
Champ Camba
2017-03-28 19:16:56 +08:00
committed by GitHub
parent 3cc466798b 8288c30a33
commit 6680f6bde3
7 changed files with 140 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/um-actions-access.php
+6 -6
View File
@@ -389,8 +389,8 @@
if ( is_user_logged_in() ){
if( isset( $opt['_um_redirect'] ) && ! empty( $opt['_um_redirect'] ) ) {
$redirect = $opt['_um_redirect'];
if( isset( $opt['_um_redirect2'] ) && ! empty( $opt['_um_redirect2'] ) ) {
$redirect = $opt['_um_redirect2'];
}else{
$redirect = site_url();
}
@@ -478,7 +478,7 @@
case 1:
if ( is_user_logged_in() )
$redirect = ( isset( $opt['_um_redirect'] ) && !empty( $opt['_um_redirect'] ) ) ? $opt['_um_redirect'] : site_url();
$redirect = ( isset( $opt['_um_redirect2'] ) && !empty( $opt['_um_redirect2'] ) ) ? $opt['_um_redirect2'] : site_url();
$redirect = $ultimatemember->access->set_referer( $redirect, "categories_1" );
$ultimatemember->access->redirect_handler = $redirect;
if ( !is_user_logged_in() )
@@ -566,8 +566,8 @@
if ( is_user_logged_in() ){
if( isset( $opt['_um_redirect'] ) && ! empty( $opt['_um_redirect'] ) ) {
$redirect = $opt['_um_redirect'];
if( isset( $opt['_um_redirect2'] ) && ! empty( $opt['_um_redirect2'] ) ) {
$redirect = $opt['_um_redirect2'];
}else{
$redirect = site_url();
}
@@ -703,7 +703,7 @@
case 1: // Logged out users only
if ( is_user_logged_in() ){
$redirect = ( isset( $opt['_um_redirect'] ) && ! empty( $opt['_um_redirect'] ) ) ? $opt['_um_redirect'] : site_url();
$redirect = ( isset( $opt['_um_redirect2'] ) && ! empty( $opt['_um_redirect2'] ) ) ? $opt['_um_redirect2'] : site_url();
$redirect = $ultimatemember->access->set_referer( $redirect, "page_cat_1a_t{$cat->term_id}_pt{$post_type}" );
$ultimatemember->access->redirect_handler = $redirect;
$ultimatemember->access->allow_access = false;
core/um-api.php
+4 -3
View File
@@ -20,8 +20,9 @@ class UM_REST_API {
add_action( 'init', array( $this, 'add_endpoint' ) );
add_action( 'template_redirect', array( $this, 'process_query' ), -1 );
add_filter( 'query_vars', array( $this, 'query_vars' ) );
add_action( 'show_user_profile', array( $this, 'user_key_field' ) );
add_action( 'edit_user_profile', array( $this, 'user_key_field' ) );
add_action( 'um_user_profile_section', array( $this, 'user_key_field' ), 2 );
add_action( 'personal_options_update', array( $this, 'update_key' ) );
add_action( 'edit_user_profile_update', array( $this, 'update_key' ) );
@@ -863,4 +864,4 @@ class UM_REST_API {
return hash( 'md5', $user->um_user_secret_key . $user->um_user_public_key );
}
}
}
core/um-user.php
+3
View File
@@ -61,6 +61,7 @@ class UM_User {
$um_user_role = get_user_meta($user->ID,'role',true);
?>
<h2><?php _e('Ultimate Member','ultimatemember') ?></h2>
<table class="form-table">
<tbody>
<tr>
@@ -79,6 +80,8 @@ class UM_User {
</tbody>
</table>
<?php }
do_action( 'um_user_profile_section' );
}
/**