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

Update 1.0.59

Browse Source
This commit is contained in:
ultimatemember
2015-02-18 00:45:09 +02:00
parent 251f7b0ef7
commit 5effe7c017
10 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/um-actions-account.php
+7 -7
View File
@@ -58,26 +58,26 @@
global $ultimatemember;
if ( strlen(trim( $_POST['first_name'] ) ) == 0 ) {
$ultimatemember->form->add_error('first_name', 'You must provide your first name');
$ultimatemember->form->add_error('first_name', __('You must provide your first name','ultimatemember') );
}
if ( strlen(trim( $_POST['last_name'] ) ) == 0 ) {
$ultimatemember->form->add_error('last_name', 'You must provide your last name');
$ultimatemember->form->add_error('last_name', __('You must provide your last name','ultimatemember') );
}
if ( strlen(trim( $_POST['user_email'] ) ) == 0 ) {
$ultimatemember->form->add_error('user_email', 'You must provide your e-mail');
$ultimatemember->form->add_error('user_email', __('You must provide your e-mail','ultimatemember') );
}
if ( !is_email( $_POST['user_email'] ) ) {
$ultimatemember->form->add_error('user_email', 'Please provide a valid e-mail');
$ultimatemember->form->add_error('user_email', __('Please provide a valid e-mail','ultimatemember') );
}
$ultimatemember->account->current_tab = 'general';
if ( $_POST['current_user_password'] != '' ) {
if ( !wp_check_password( $_POST['current_user_password'], um_user('user_pass'), um_user('ID') ) ) {
$ultimatemember->form->add_error('current_user_password', 'This is not your password');
$ultimatemember->form->add_error('current_user_password', __('This is not your password','ultimatemember') );
$ultimatemember->account->current_tab = 'password';
} else { // correct password
@@ -108,10 +108,10 @@
if ( isset($_POST['um_account_submit']) && $_POST['um_account_submit'] == __('Delete Account','ultimatemember') ) {
if ( strlen(trim( $_POST['single_user_password'] ) ) == 0 ) {
$ultimatemember->form->add_error('single_user_password', 'You must enter your password');
$ultimatemember->form->add_error('single_user_password', __('You must enter your password','ultimatemember') );
} else {
if ( !wp_check_password( $_POST['single_user_password'], um_user('user_pass'), um_user('ID') ) ) {
$ultimatemember->form->add_error('single_user_password', 'This is not your password');
$ultimatemember->form->add_error('single_user_password', __('This is not your password','ultimatemember') );
}
}
$ultimatemember->account->current_tab = 'delete';
core/um-members.php
+1 -1
View File
@@ -148,7 +148,7 @@ class UM_Members {
$array['total_users'] = (isset( $max_users ) && $max_users && $max_users <= $users->total_users ) ? $max_users : $users->total_users;
$array['page'] = get_query_var('members_page') ? get_query_var('members_page') : 1;
$array['page'] = isset($_REQUEST['members_page']) ? $_REQUEST['members_page'] : 1;
$array['total_pages'] = ceil( $array['total_users'] / $profiles_per_page );
core/um-permalinks.php
+1 -1
View File
@@ -34,7 +34,7 @@ class UM_Permalinks {
global $post;
if ( is_front_page() ) :
$page_url = home_url();
$page_url = home_url() . $_SERVER["REQUEST_URI"];
else :
$page_url = 'http';
core/um-rewrite.php
-1
View File
@@ -22,7 +22,6 @@ class UM_Rewrite {
$public_query_vars[] = 'um_tab';
$public_query_vars[] = 'profiletab';
$public_query_vars[] = 'subnav';
$public_query_vars[] = 'members_page';
return $public_query_vars;
}
core/um-setup.php
+4 -5
View File
@@ -379,13 +379,12 @@ class UM_Setup {
$users = get_users( array('fields' => 'ID') );
foreach( $users as $id ) {
if ( !get_user_meta( $id, 'account_status', true ) ) {
update_user_meta( $id, 'account_status', 'approved' );
}
delete_user_meta( $id, 'account_status' );
delete_user_meta( $id, 'role' );
update_user_meta( $id, 'account_status', 'approved' );
if ( !is_super_admin( $id ) ) {
if ( is_numeric( $id ) ) {
update_user_meta( $id, 'role', 'member' );