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

Fix change password

Browse Source
This commit is contained in:
champsupertramp
2016-06-23 13:45:26 +08:00
parent 48c294393f
commit ecdb9ceaf8
3 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/um-account.js
+3 -1
View File
@@ -16,6 +16,8 @@ jQuery(document).ready(function() {
var url_ = jQuery(this).attr('href');
var tab_ = jQuery(this).attr('data-tab');
jQuery("#_um_account_tab").val( tab_ );
window.history.pushState("", "", url_);
jQuery('.um-account-tab').hide();
@@ -33,7 +35,7 @@ jQuery(document).ready(function() {
var tab_ = jQuery(this).attr('data-tab');
var div = jQuery(this).parents('div');
var link = jQuery(this);
jQuery('.um-account-tab').hide();
if ( link.hasClass('current') ) {
assets/js/um.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
core/um-actions-account.php
+24 -16
View File
@@ -93,25 +93,29 @@
// errors on general tab
if ( isset($_POST['um_account_submit']) && $_POST['um_account_submit'] != __('Delete Account','ultimatemember') ) {
$current_tab = isset( $_POST['_um_account_tab'] ) ? $_POST['_um_account_tab']: '';
if( $current_tab != 'password' ){
if ( isset($_POST['first_name']) && strlen(trim( $_POST['first_name'] ) ) == 0 ) {
$ultimatemember->form->add_error('first_name', __('You must provide your first name','ultimatemember') );
}
if ( isset($_POST['first_name']) && strlen(trim( $_POST['first_name'] ) ) == 0 ) {
$ultimatemember->form->add_error('first_name', __('You must provide your first name','ultimatemember') );
}
if ( isset($_POST['last_name']) && strlen(trim( $_POST['last_name'] ) ) == 0 ) {
$ultimatemember->form->add_error('last_name', __('You must provide your last name','ultimatemember') );
}
if ( isset($_POST['last_name']) && strlen(trim( $_POST['last_name'] ) ) == 0 ) {
$ultimatemember->form->add_error('last_name', __('You must provide your last name','ultimatemember') );
}
if ( isset($_POST['user_email']) && strlen(trim( $_POST['user_email'] ) ) == 0 ) {
$ultimatemember->form->add_error('user_email', __('You must provide your e-mail','ultimatemember') );
}
if ( isset($_POST['user_email']) && strlen(trim( $_POST['user_email'] ) ) == 0 ) {
$ultimatemember->form->add_error('user_email', __('You must provide your e-mail','ultimatemember') );
}
if ( isset($_POST['user_email']) && !is_email( $_POST['user_email'] ) ) {
$ultimatemember->form->add_error('user_email', __('Please provide a valid e-mail','ultimatemember') );
}
if ( isset($_POST['user_email']) && !is_email( $_POST['user_email'] ) ) {
$ultimatemember->form->add_error('user_email', __('Please provide a valid e-mail','ultimatemember') );
}
if ( email_exists( $_POST['user_email'] ) && email_exists( $_POST['user_email'] ) != get_current_user_id() ) {
$ultimatemember->form->add_error('user_email', __('Email already linked to another account','ultimatemember') );
if ( email_exists( $_POST['user_email'] ) && email_exists( $_POST['user_email'] ) != get_current_user_id() ) {
$ultimatemember->form->add_error('user_email', __('Email already linked to another account','ultimatemember') );
}
}
}
@@ -175,11 +179,15 @@
***/
add_action('um_account_page_hidden_fields','um_account_page_hidden_fields');
function um_account_page_hidden_fields( $args ) {
global $ultimatemember;
?>
<input type="hidden" name="_um_account" id="_um_account" value="1" />
<?php $current_tab = $ultimatemember->account->current_tab; ?>
<input type="hidden" name="_um_account_tab" id="_um_account_tab" value="<?php echo $current_tab;?>" />
<?php
}