| @@ -8,9 +8,10 @@ | ||
| 8 | 8 | if ( ! is_user_logged_in() ) { |
| 9 | 9 | |
| 10 | 10 | if ( ! empty( $get_data['donation_id'] ) ) { |
| 11 | 11 | $give_login_redirect = add_query_arg( |
| 12 | - 'donation_id', $get_data['donation_id'], | |
| 12 | + 'donation_id', | |
| 13 | + $get_data['donation_id'], | |
| 13 | 14 | give_get_history_page_uri() |
| 14 | 15 | ); |
| 15 | 16 | } |
| 16 | 17 | |
| @@ -29,9 +30,9 @@ | ||
| 29 | 30 | */ |
| 30 | 31 | do_action( 'give_login_fields_before' ); |
| 31 | 32 | ?> |
| 32 | 33 | <div class="give-login-username give-login"> |
| 33 | - <label for="give_user_login"><?php esc_html_e( 'Username', 'give' ); ?></label> | |
| 34 | + <label for="give_user_login"><?php esc_html_e( 'Username or Email Address', 'give' ); ?></label> | |
| 34 | 35 | <input name="give_user_login" id="give_user_login" class="give-required give-input" type="text" required aria-required="true" /> |
| 35 | 36 | </div> |
| 36 | 37 | |
| 37 | 38 | <div class="give-login-password give-login"> |
| @@ -65,20 +66,23 @@ | ||
| 65 | 66 | </form> |
| 66 | 67 | <?php |
| 67 | 68 | } elseif ( isset( $get_data['give-login-success'] ) && true === (bool) $get_data['give-login-success'] ) { |
| 68 | 69 | |
| 69 | - Give()->notices->print_frontend_notice( | |
| 70 | + Give_Notices::print_frontend_notice( | |
| 70 | 71 | apply_filters( 'give_successful_login_message', esc_html__( 'Login successful. Welcome!', 'give' ) ), |
| 71 | 72 | true, |
| 72 | 73 | 'success' |
| 73 | 74 | ); |
| 74 | 75 | } else { |
| 75 | - Give()->notices->print_frontend_notice( | |
| 76 | - apply_filters( 'give_already_logged_in_message', sprintf( | |
| 77 | - /* translators: %s Redirect URL. */ | |
| 78 | - __( 'You are already logged in to the site. <a href="%s">Click here</a> to logout.', 'give' ), | |
| 79 | - esc_url( admin_url() ) | |
| 80 | - ) ), | |
| 76 | + Give_Notices::print_frontend_notice( | |
| 77 | + apply_filters( | |
| 78 | + 'give_already_logged_in_message', | |
| 79 | + sprintf( | |
| 80 | + /* translators: %s Redirect URL. */ | |
| 81 | + __( 'You are already logged in to the site. <a href="%s">Click here</a> to log out.', 'give' ), | |
| 82 | + esc_url( wp_logout_url() ) | |
| 83 | + ) | |
| 84 | + ), | |
| 81 | 85 | true, |
| 82 | 86 | 'warning' |
| 83 | 87 | ); |
| 84 | 88 | } |
