CRM-15645 Petition email confirmation URL incompatible with WordPress

diff --git a/CRM/Campaign/BAO/Petition.php b/CRM/Campaign/BAO/Petition.php
index 0863962d248de2c03143926775cf033c60299d1e..17148b34e64e0eea2f48483338b97d6cdeb7877e 100644 (file)
--- 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 dd4c5cf7857260120f44228dc5b27cbd16753d75..0674ddeb24a6b136c426ad9b2be6686bbe3fcd26 100644 (file)
--- 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 ||