Merge pull request #1642 from WordImpress/issue/1614

Issue/1614
impress-org · Apr 28, 2017 · e7f67e8 · e7f67e8
2 parents ec839ce + a92d205
commit e7f67e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/includes/shortcodes.php b/includes/shortcodes.php
@@ -52,16 +52,18 @@ function give_donation_history() {
 		return ob_get_clean();
 
 	} elseif ( give_is_setting_enabled( $email_access ) ) {
-		//Is Email-based access enabled?
+		// Is Email-based access enabled?
 		ob_start();
 		give_get_template_part( 'email', 'login-form' );
 
 		return ob_get_clean();
+
 	} else {
 
-		echo apply_filters( 'give_donation_history_nonuser_message', give_output_error( __( 'You must be logged in to view your donation history. Please login using your account or create an account using the same email you used to donate with.', 'give' ), false ) );
-		echo do_shortcode( '[give_login]' );
-
+		$output = apply_filters( 'give_donation_history_nonuser_message', give_output_error( __( 'You must be logged in to view your donation history. Please login using your account or create an account using the same email you used to donate with.', 'give' ), false ) );
+		$output .= do_shortcode( '[give_login]' );
+
+		return $output;
 	}
 }
 
@@ -398,7 +400,7 @@ function give_process_profile_editor_updates( $data ) {
 	 *
 	 * @since 1.0
 	 *
-	 * @param int   $user_id  The ID of the user.
+	 * @param int $user_id The ID of the user.
 	 * @param array $userdata User info, including ID, first name, last name, display name and email.
 	 */
 	do_action( 'give_pre_update_user_profile', $user_id, $userdata );
@@ -447,7 +449,7 @@ function give_process_profile_editor_updates( $data ) {
 		 *
 		 * @since 1.0
 		 *
-		 * @param int   $user_id  The ID of the user.
+		 * @param int $user_id The ID of the user.
 		 * @param array $userdata User info, including ID, first name, last name, display name and email.
 		 */
 		do_action( 'give_user_profile_updated', $user_id, $userdata );

diff --git a/includes/template-functions.php b/includes/template-functions.php
@@ -413,16 +413,6 @@ function give_template_single_title() {
 	}
 }
 
-if ( ! function_exists( 'give_show_avatars' ) ) {
-
-	/**
-	 * Output the product title.
-	 */
-	function give_show_avatars() {
-		echo do_shortcode( '[give_donors_gravatars]' );
-	}
-}
-
 /**
  * Conditional Functions
  */