fix test failures

diff --git a/CRM/Contact/Page/DedupeFind.php b/CRM/Contact/Page/DedupeFind.php
index 012529f882ed7b650f69717fb17c3e1870cb191e..0646f0f7f7b3357bbdeb414f6430f14f1c0024f5 100644 (file)
--- a/CRM/Contact/Page/DedupeFind.php
+++ b/CRM/Contact/Page/DedupeFind.php
@@ -61,7 +61,7 @@ class CRM_Contact_Page_DedupeFind extends CRM_Core_Page_Basic {
     $action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE, 0);
     $context = CRM_Utils_Request::retrieve('context', 'String', $this);
     $limit = CRM_Utils_Request::retrieve('limit', 'Integer', $this);
-    $rgid = CRM_Utils_Request::retrieve('rgid', 'Positive');
+    $rgid = CRM_Utils_Request::retrieve('rgid', 'Positive', $this);
     $urlQry = array(
       'reset' => 1,
       'rgid' => $rgid,

diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php
index 492ece8ccb0ebcc4c0fbd39439208c0499c664a6..eb6fc33e74e1d53e92016beb7fae7bc1e50bbb10 100644 (file)
--- a/CRM/Event/BAO/Participant.php
+++ b/CRM/Event/BAO/Participant.php
@@ -2209,8 +2209,7 @@ WHERE (entity_table = 'civicrm_participant' AND entity_id = {$participantId} AND
 
     $date = CRM_Utils_Date::currentDBDate();
     $event = CRM_Event_BAO_Event::getEvents(0, $eventId);
-    $eventTitle = $event[$eventId];
-    $subject = "Registration selections changed for $eventTitle";
+    $subject = sprintf("Registration selections changed for %s", CRM_Utils_Array::value($eventId, $event));
     $targetCid = $contactId;
     $srcRecId = $participantId;
 

diff --git a/CRM/PCP/Page/PCP.php b/CRM/PCP/Page/PCP.php
index c7255ffb5fc35f66b3d5f1d9d45d5da787b36582..e3512ee7c353f5106fea89fa5f7ac1483d0ef30c 100644 (file)
--- a/CRM/PCP/Page/PCP.php
+++ b/CRM/PCP/Page/PCP.php
@@ -214,7 +214,7 @@ class CRM_PCP_Page_PCP extends CRM_Core_Page_Basic {
       }
     }
 
-    $approvedId = CRM_Core_OptionGroup::getValue('pcp_status', 'Approved', 'name');
+    $approvedId = CRM_Core_PseudoConstant::getKey('CRM_PCP_BAO_PCP', 'status_id', 'Approved');
 
     //check for delete CRM-4418
     $allowToDelete = CRM_Core_Permission::check('delete in CiviContribute');