Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue/1614 #1642

Merged
merged 2 commits into from
Apr 28, 2017
Merged

Issue/1614 #1642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e315f7
Don’t echo short code output, return it. #1614
DevinWalker Apr 28, 2017
a92d205
Remove donor gravatars shortcake not in use
DevinWalker Apr 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions includes/shortcodes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down
10 changes: 0 additions & 10 deletions includes/template-functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down