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

Fix pledge activation URL #245

Merged
merged 2 commits into from
Feb 5, 2024
Merged

Fix pledge activation URL #245

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
932e503
Fix pledge activation URL
pkevan Feb 5, 2024
d423aeb
Fix unrelated PHPCS
pkevan Feb 5, 2024
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 plugins/wporg-5ftf/includes/pledge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
add_action( 'pledge_footer', __NAMESPACE__ . '\render_manage_link_request' );
add_action( 'wp_footer', __NAMESPACE__ . '\render_js_templates' );

// Misc
// Misc.
add_action( 'init', __NAMESPACE__ . '\schedule_cron_jobs' );
add_action( '5ftf_send_update_reminders', __NAMESPACE__ . '\send_update_reminders' );

Expand Down Expand Up @@ -250,7 +250,7 @@ function action_success_message() {
* @return array The filtered list of post display states.
*/
function add_status_to_display( $post_states, $post ) {
$showing_status = $_REQUEST['post_status'] ?? $showing_status = '';
$showing_status = $_REQUEST['post_status'] ?? '';

$status = DEACTIVE_STATUS;
if ( $showing_status !== $status && $status === $post->post_status ) {
Expand Down Expand Up @@ -350,6 +350,8 @@ function is_active_pledge( $post_id ) {
* @return int|WP_Error Post ID on success. Otherwise WP_Error.
*/
function create_new_pledge( $name ) {
// Grab the ID of the post we are on before inserting a pledge.
$pledge_form_post_id = get_post()->ID;
$args = array(
'post_type' => CPT_ID,
'post_title' => $name,
Expand All @@ -360,7 +362,7 @@ function create_new_pledge( $name ) {
// The pledge's meta data is saved at this point via `save_pledge_meta()`, which is a `save_post` callback.

if ( ! is_wp_error( $pledge_id ) ) {
Email\send_pledge_confirmation_email( $pledge_id, get_post()->ID );
Email\send_pledge_confirmation_email( $pledge_id, $pledge_form_post_id );
}

return $pledge_id;
Expand Down Expand Up @@ -452,7 +454,7 @@ function filter_query( $query ) {
break;

default:
$date = date( 'YmdH' );
$date = gmdate( 'YmdH' );
$query->set( 'orderby', "RAND($date)" );
break;
}
Expand Down Expand Up @@ -572,7 +574,7 @@ function schedule_cron_jobs() {
/**
* Periodically ask companies to review their pledge for accuracy.
*/
function send_update_reminders() : void {
function send_update_reminders(): void {
$resend_interval = 6 * MONTH_IN_SECONDS;
$resend_threshold = time() - ( $resend_interval );
$deactivation_date = time() + ( 2 * MONTH_IN_SECONDS );
Expand Down Expand Up @@ -608,7 +610,7 @@ function send_update_reminders() : void {
'key' => '5ftf_inactive_deactivate_date',
'compare' => 'NOT EXISTS',
),
)
),
) );

foreach ( $pledges as $pledge ) {
Expand Down
Loading