From ccbeaf61791538d1861c561eae4eec4dc4d695aa Mon Sep 17 00:00:00 2001 From: "Kyle B. Johnson" Date: Fri, 7 Feb 2025 13:00:09 -0500 Subject: [PATCH 1/3] fix: Redirect disabled campaign pages --- .../Actions/RedirectDisabledCampaignPage.php | 31 +++++++++++++++++++ src/Campaigns/ServiceProvider.php | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 src/Campaigns/Actions/RedirectDisabledCampaignPage.php diff --git a/src/Campaigns/Actions/RedirectDisabledCampaignPage.php b/src/Campaigns/Actions/RedirectDisabledCampaignPage.php new file mode 100644 index 0000000000..05a7436896 --- /dev/null +++ b/src/Campaigns/Actions/RedirectDisabledCampaignPage.php @@ -0,0 +1,31 @@ +campaign()->enableCampaignPage) { + global $wp_query; + $wp_query->set_404(); + status_header(404); + get_template_part(404); + exit; + } + } +} diff --git a/src/Campaigns/ServiceProvider.php b/src/Campaigns/ServiceProvider.php index c6c7f6282c..352368041e 100644 --- a/src/Campaigns/ServiceProvider.php +++ b/src/Campaigns/ServiceProvider.php @@ -14,6 +14,7 @@ use Give\Campaigns\Migrations\RevenueTable\AssociateDonationsToCampaign; use Give\Campaigns\Migrations\Tables\CreateCampaignFormsTable; use Give\Campaigns\Migrations\Tables\CreateCampaignsTable; +use Give\Campaigns\Models\CampaignPage; use Give\Campaigns\Repositories\CampaignRepository; use Give\DonationForms\V2\DonationFormsAdminPage; use Give\Framework\Migrations\MigrationsRegister; @@ -113,6 +114,7 @@ private function registerMenus() private function setupCampaignPages() { Hooks::addAction('init', Actions\RegisterCampaignPagePostType::class); + Hooks::addAction('template_redirect', Actions\RedirectDisabledCampaignPage::class); Hooks::addAction('admin_action_edit_campaign_page', Actions\EditCampaignPageRedirect::class); } From 4bc3303fe3e8bf23aa21ee43c40e8177ccdeac0b Mon Sep 17 00:00:00 2001 From: "Kyle B. Johnson" Date: Thu, 20 Feb 2025 22:02:33 -0500 Subject: [PATCH 2/3] Update src/Campaigns/Actions/RedirectDisabledCampaignPage.php Co-authored-by: Jon Waldstein --- src/Campaigns/Actions/RedirectDisabledCampaignPage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Campaigns/Actions/RedirectDisabledCampaignPage.php b/src/Campaigns/Actions/RedirectDisabledCampaignPage.php index 05a7436896..31177a89f2 100644 --- a/src/Campaigns/Actions/RedirectDisabledCampaignPage.php +++ b/src/Campaigns/Actions/RedirectDisabledCampaignPage.php @@ -20,7 +20,7 @@ public function __invoke() $campaignPage = CampaignPage::find(get_the_ID()); - if(!$campaignPage->campaign()->enableCampaignPage) { + if($campaignPage && !$campaignPage->campaign()->enableCampaignPage) { global $wp_query; $wp_query->set_404(); status_header(404); From f04c773e88dc7de21cbd54307d3f9449a48db7b4 Mon Sep 17 00:00:00 2001 From: "Kyle B. Johnson" Date: Thu, 20 Feb 2025 22:07:37 -0500 Subject: [PATCH 3/3] Update src/Campaigns/Actions/RedirectDisabledCampaignPage.php Co-authored-by: Jon Waldstein --- src/Campaigns/Actions/RedirectDisabledCampaignPage.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Campaigns/Actions/RedirectDisabledCampaignPage.php b/src/Campaigns/Actions/RedirectDisabledCampaignPage.php index 31177a89f2..76d4a2eded 100644 --- a/src/Campaigns/Actions/RedirectDisabledCampaignPage.php +++ b/src/Campaigns/Actions/RedirectDisabledCampaignPage.php @@ -24,8 +24,6 @@ public function __invoke() global $wp_query; $wp_query->set_404(); status_header(404); - get_template_part(404); - exit; } } }