Merge pull request #2623 from WordImpress/issue/2622

Properly allow `login-redirect` attribute to override variable #2622

includes/login-register.php

@@ -27,8 +27,9 @@
  * @return string Login form
  */
 function give_login_form( $login_redirect = '', $logout_redirect = '' ) {
+
 	if ( empty( $login_redirect ) ) {
-		$login_redirect = add_query_arg( 'give-login-success', 'true', give_get_current_page_url() );
+		$login_redirect = add_query_arg( 'give-login-success', 'true', give_get_history_page_uri() );
 	}
 
 	if ( empty( $logout_redirect ) ) {
@@ -391,15 +392,13 @@ function give_email_access_login() {
 
 				return true;
 			}
-
 		} else {
 
 			give_set_error( 'give-no-donations', __( 'We were unable to find any donations associated with the email address provided. Please try again using another email.', 'give' ) );
 
-		}  // End if().
-
+		}
 	} // End if().
 
 }
 
-add_action( 'give_email_access_form_login', 'give_email_access_login' );
+add_action( 'give_email_access_form_login', 'give_email_access_login' );

includes/shortcodes.php

@@ -120,7 +120,7 @@ function give_form_shortcode( $atts ) {
 	$atts['show_title'] = filter_var( $atts['show_title'], FILTER_VALIDATE_BOOLEAN );
 	$atts['show_goal']  = filter_var( $atts['show_goal'], FILTER_VALIDATE_BOOLEAN );
 
-	//get the Give Form
+	// get the Give Form
 	ob_start();
 	give_get_donation_form( $atts );
 	$final_output = ob_get_clean();
@@ -148,21 +148,20 @@ function give_goal_shortcode( $atts ) {
 		'show_bar'  => true,
 	), $atts, 'give_goal' );
 
-
-	//get the Give Form.
+	// get the Give Form.
 	ob_start();
 
-	//Sanity check 1: ensure there is an ID Provided.
+	// Sanity check 1: ensure there is an ID Provided.
 	if ( empty( $atts['id'] ) ) {
 		Give()->notices->print_frontend_notice( __( 'The shortcode is missing Donation Form ID attribute.', 'give' ), true );
 	}
 
-	//Sanity check 2: Check the form even has Goals enabled.
+	// Sanity check 2: Check the form even has Goals enabled.
 	if ( ! give_is_setting_enabled( give_get_meta( $atts['id'], '_give_goal_option', true ) ) ) {
 
 		Give()->notices->print_frontend_notice( __( 'The form does not have Goals enabled.', 'give' ), true );
 	} else {
-		//Passed all sanity checks: output Goal.
+		// Passed all sanity checks: output Goal.
 		give_show_goal_progress( $atts['id'], $atts );
 	}
 
@@ -189,10 +188,10 @@ function give_goal_shortcode( $atts ) {
  * @return string
  */
 function give_login_form_shortcode( $atts ) {
+
 	$atts = shortcode_atts( array(
 		// Add backward compatibility for redirect attribute.
 		'redirect' => '',
-
 		'login-redirect'  => '',
 		'logout-redirect' => '',
 	), $atts, 'give_login' );
@@ -255,10 +254,10 @@ function give_receipt_shortcode( $atts ) {
 		'status_notice'  => true,
 	), $atts, 'give_receipt' );
 
-	//set $session var
+	// set $session var
 	$session = give_get_purchase_session();
 
-	//set payment key var
+	// set payment key var
 	if ( isset( $_GET['payment_key'] ) ) {
 		$payment_key = urldecode( $_GET['payment_key'] );
 	} elseif ( $session ) {
@@ -357,7 +356,7 @@ function give_profile_editor_shortcode( $atts ) {
 
 	// Restrict access to donor profile, if donor and user are disconnected.
 	$is_donor_disconnected = get_user_meta( get_current_user_id(), '_give_is_donor_disconnected', true );
-	if( is_user_logged_in() && $is_donor_disconnected ) {
+	if ( is_user_logged_in() && $is_donor_disconnected ) {
 		Give()->notices->print_frontend_notice( __( 'Your Donor and User profile are no longer connected. Please contact the site administrator.', 'give' ), true, 'error' );
 		return false;
 	}
@@ -431,7 +430,6 @@ function give_process_profile_editor_updates( $data ) {
 		give_set_error( 'empty_first_name', __( 'Please enter your first name.', 'give' ) );
 	}
 
-
 	// Make sure to validate passwords for existing Donors.
 	give_validate_user_password( $password, $confirm_password );
 
@@ -447,13 +445,12 @@ function give_process_profile_editor_updates( $data ) {
 		// Make sure the new email doesn't belong to another user
 		if ( email_exists( $email ) ) {
 			give_set_error( 'user_email_exists', __( 'The email you entered belongs to another user. Please use another.', 'give' ) );
-		} elseif ( Give()->donors->get_donor_by( 'email', $email ) ){
+		} elseif ( Give()->donors->get_donor_by( 'email', $email ) ) {
 			// Make sure the new email doesn't belong to another user
 			give_set_error( 'donor_email_exists', __( 'The email you entered belongs to another donor. Please use another.', 'give' ) );
 		}
 	}
 
-
 	// Check for errors.
 	$errors = give_get_errors();
 
@@ -464,11 +461,12 @@ function give_process_profile_editor_updates( $data ) {
 	}
 
 	// Update Donor First Name and Last Name.
-	Give()->donors->update( $donor->id, array( 'name' => trim( "{$first_name} {$last_name}" ) ) );
+	Give()->donors->update( $donor->id, array(
+		'name' => trim( "{$first_name} {$last_name}" ),
+	) );
 	Give()->donor_meta->update_meta( $donor->id, '_give_donor_first_name', $first_name );
 	Give()->donor_meta->update_meta( $donor->id, '_give_donor_last_name', $last_name );
 
-
 	// Update the user.
 	$updated = wp_update_user( $userdata );
 

templates/shortcode-login.php

@@ -3,11 +3,9 @@
  * This template is used to display the login form with [give_login]
  */
 
-global $give_logout_redirect;
 
 if ( ! is_user_logged_in() ) {
 
-	$give_login_redirect = give_get_history_page_uri();
 	if ( ! empty( $_GET['payment_key'] ) ) {
 		$give_login_redirect = add_query_arg( 'payment_key', give_clean( $_GET['payment_key'] ) , give_get_history_page_uri() );
 	}