From 18d62c87bcadc9fa8daa8c9c52ff070405c3f8a4 Mon Sep 17 00:00:00 2001 From: jitendrapurohit Date: Thu, 27 Nov 2014 12:12:11 +0530 Subject: [PATCH] CRM-15645 Petition email confirmation URL incompatible with WordPress --- CRM/Campaign/BAO/Petition.php | 4 ++-- CRM/Campaign/Page/Petition/Confirm.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Campaign/BAO/Petition.php b/CRM/Campaign/BAO/Petition.php index 0863962d24..17148b34e6 100644 --- a/CRM/Campaign/BAO/Petition.php +++ b/CRM/Campaign/BAO/Petition.php @@ -653,11 +653,11 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; $confirmUrl = CRM_Utils_System::url('civicrm/petition/confirm', - "reset=1&cid={$se->contact_id}&sid={$se->id}&h={$se->hash}&a={$params['activityId']}&p={$params['sid']}", + "reset=1&cid={$se->contact_id}&sid={$se->id}&h={$se->hash}&a={$params['activityId']}&pid={$params['sid']}", TRUE ); $confirmUrlPlainText = CRM_Utils_System::url('civicrm/petition/confirm', - "reset=1&cid={$se->contact_id}&sid={$se->id}&h={$se->hash}&a={$params['activityId']}&p={$params['sid']}", + "reset=1&cid={$se->contact_id}&sid={$se->id}&h={$se->hash}&a={$params['activityId']}&pid={$params['sid']}", TRUE, NULL, FALSE diff --git a/CRM/Campaign/Page/Petition/Confirm.php b/CRM/Campaign/Page/Petition/Confirm.php index dd4c5cf785..0674ddeb24 100644 --- a/CRM/Campaign/Page/Petition/Confirm.php +++ b/CRM/Campaign/Page/Petition/Confirm.php @@ -44,7 +44,7 @@ class CRM_Campaign_Page_Petition_Confirm extends CRM_Core_Page { $subscribe_id = CRM_Utils_Request::retrieve('sid', 'Integer', CRM_Core_DAO::$_nullObject); $hash = CRM_Utils_Request::retrieve('h', 'String', CRM_Core_DAO::$_nullObject); $activity_id = CRM_Utils_Request::retrieve('a', 'String', CRM_Core_DAO::$_nullObject); - $petition_id = CRM_Utils_Request::retrieve('p', 'String', CRM_Core_DAO::$_nullObject); + $petition_id = CRM_Utils_Request::retrieve('pid', 'String', CRM_Core_DAO::$_nullObject); if (!$contact_id || !$subscribe_id || -- 2.25.1