From 7add652df1cac1dd1a3bd6696a7abc0ccd01d14d Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@kcristiano.com>
Date: Mon, 13 Jul 2020 08:32:40 -0400
Subject: [PATCH] dev/core#1865 Remove civiwp and option query strings from
redirected
PR 17797 @seamuslee001
---
civicrm/CRM/Mailing/Page/Url.php | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/civicrm/CRM/Mailing/Page/Url.php b/civicrm/CRM/Mailing/Page/Url.php
index 29be68c661..cef3c8d5e1 100644
--- a/civicrm/CRM/Mailing/Page/Url.php
+++ b/civicrm/CRM/Mailing/Page/Url.php
@@ -91,10 +91,16 @@ class CRM_Mailing_Page_Url extends CRM_Core_Page {
unset($query_param['qid']);
unset($query_param['u']);
unset($query_param[$config->userFrameworkURLVar]);
+
+ // @see dev/core#1865 for some additional query strings we need to remove as well.
if ($config->userFramework === 'WordPress') {
// Ugh
unset($query_param['page']);
unset($query_param['noheader']);
+ unset($query_param['civiwp']);
+ }
+ elseif ($config->userFramework === 'Joomla') {
+ unset($query_param['option']);
}
$query_string = http_build_query($query_param);
--
GitLab