WordPress.org
Get WordPress

Plugin Directory

Changeset 987420


Ignore:
Timestamp:
09/11/2014 04:54:25 PM (12 years ago)
Author:
radiok
Message:

Fixed Email as Username feature following modifier change from var (public) to private on errors and error_data in WP_Error class (r28511).

Location:
register-plus-redux/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • register-plus-redux/trunk/rpr-login.php

    r971431 r987420  
    371371        public /*.object.*/ function rpr_registration_errors( /*.object.*/ $errors, /*.string.*/ $sanitized_user_login, /*.string.*/ $user_email ) {
    372372            global $register_plus_redux;
    373             if ( '1' === $register_plus_redux->rpr_get_option( 'username_is_email' ) )  {
    374                 if ( is_array( $errors->errors ) && isset( $errors->errors['empty_username'] ) ) unset( $errors->errors['empty_username'] );
    375                 if ( is_array( $errors->error_data ) && isset( $errors->error_data['empty_username'] ) ) unset( $errors->error_data['empty_username'] );
     373            if ( '1' === $register_plus_redux->rpr_get_option( 'username_is_email' ) ) {
     374                if ( is_array( $errors->errors ) && isset( $errors->errors['empty_username'] ) ) {
     375                    $temp = $errors->errors;
     376                    unset( $temp['empty_username'] );
     377                    $errors->errors = $temp;
     378                }
     379                if ( is_array( $errors->error_data ) && isset( $errors->error_data['empty_username'] ) ) {
     380                    $temp = $errors->error_data;
     381                    unset( $temp['empty_username'] );
     382                    $errors->error_data = $temp;
     383                }
    376384                $sanitized_user_login = sanitize_user( $user_email );
    377385                if ( $sanitized_user_login !== $user_email ) {
    … …  
    566574            global $register_plus_redux;
    567575            global $errors;
    568             if ( is_array( $errors->errors ) && isset( $errors->errors['registered'] ) ) unset( $errors->errors['registered'] );
    569             if ( is_array( $errors->error_data ) && isset( $errors->error_data['registered'] ) ) unset( $errors->error_data['registered'] );
     576            if ( is_array( $errors->errors ) && isset( $errors->errors['registered'] ) ) {
     577                $temp = $errors->errors;
     578                unset( $temp['registered'] );
     579                $errors->errors = $temp;
     580            }
     581            if ( is_array( $errors->error_data ) && isset( $errors->error_data['registered'] ) ) {
     582                $temp = $errors->error_data;
     583                unset( $temp['registered'] );
     584                $errors->error_data = $temp;
     585            }
    570586            $errors->add( 'verify_user_email', nl2br( $register_plus_redux->rpr_get_option( 'message_verify_user_email' ) ), 'message' );
    571587            login_header( __('Verify Email', 'register-plus-redux' ), '', $errors);
    … …  
    577593            global $register_plus_redux;
    578594            global $errors;
    579             if ( is_array( $errors->errors ) && isset( $errors->errors['registered'] ) ) unset( $errors->errors['registered'] );
    580             if ( is_array( $errors->error_data ) && isset( $errors->error_data['registered'] ) ) unset( $errors->error_data['registered'] );
     595            if ( is_array( $errors->errors ) && isset( $errors->errors['registered'] ) ) {
     596                $temp = $errors->errors;
     597                unset( $temp['registered'] );
     598                $errors->errors = $temp;
     599            }
     600            if ( is_array( $errors->error_data ) && isset( $errors->error_data['registered'] ) ) {
     601                $temp = $errors->error_data;
     602                unset( $temp['registered'] );
     603                $errors->error_data = $temp;
     604            }
    581605            $errors->add( 'verify_user_admin', nl2br( $register_plus_redux->rpr_get_option( 'message_verify_user_admin' ) ), 'message' );
    582606            login_header( __('Admin Verification', 'register-plus-redux' ), '', $errors);

  • register-plus-redux/trunk/rpr-signup.php

    r706791 r987420  
    612612                global $wpdb;
    613613
    614                 if ( is_array( $result['errors']->errors ) && isset( $result['errors']->errors['user_name'] ) ) unset( $result['errors']->errors['user_name'] );
    615                 if ( is_array( $result['errors']->error_data ) && isset( $result['errors']->error_data['user_name'] ) ) unset( $result['errors']->error_data['user_name'] );
     614                if ( is_array( $result['errors']->errors ) && isset( $result['errors']->errors['user_name'] ) ) {
     615                    $temp = $result['errors']->errors;
     616                    unset( $temp['user_name'] );
     617                    $result['errors']->errors = $temp;
     618                }
     619                if ( is_array( $result['errors']->error_data ) && isset( $result['errors']->error_data['user_name'] ) ) {
     620                    $temp = $result['errors']->error_data;
     621                    unset( $temp['user_name'] );
     622                    $result['errors']->error_data = $temp;
     623                }
    616624
    617625                $result['user_name'] = $result['user_email'];
Note: See TracChangeset for help on using the changeset viewer.