Merge pull request henare#13 from kenwest/0.7

Don't need to set UserId to zero in CiviCRM 4.5 or above

api/v3/Job/Eway.php

@@ -447,20 +447,16 @@ function send_receipt_email($contribution_id) {
     'isTest' => $contribution->is_test
   );
 
-  // TODO: Fix CRM_Core_Payment::subscriptionUrl()
-  //
-  // Currently that function fails to affix a checksum when the session's UserId
-  // is set, which is unfortunate since CiviCRM Jobs run with a user context for
-  // permissioning purposes.
-  //
-  // subscriptionUrl() just needs to check if the contactId associated with the
-  // subscription is equal to the userId, and if not, add a checksum.
-  //
-  // To work around this, I am temporarily setting the UserId to zero, and hoping
-  // there are no exceptions thrown.
-  $session = CRM_Core_Session::singleton();
-  $activeUser = $session->get('userID');
-  $session->set('userID', 0);
+  if (!_versionAtLeast(4.5)) {
+    // Prior to v4.5, CRM_Core_Payment::subscriptionUrl() failed to affix a
+    // checksum when the session's UserId is set, which is unfortunate since
+    // CiviCRM Jobs run with a user context for permissioning purposes.
+    //
+    // To work around this, temporarily set the UserId to zero.
+    $session = CRM_Core_Session::singleton();
+    $activeUser = $session->get('userID');
+    $session->set('userID', 0);
+  }
 
   $processor = array();
   $mode = empty($contribution->is_test) ? 'live' : 'test';
@@ -476,9 +472,11 @@ function send_receipt_email($contribution_id) {
     $params['tplParams']['updateSubscriptionUrl'] = $eWayProcessor->subscriptionURL($contribution->contribution_recur_id, 'recur', 'update');
   }
 
-  // TODO: Fix CRM_Core_Payment::subscriptionUrl()
-  // See comment above.
-  $session->set('userID', $activeUser);
+  if (!_versionAtLeast(4.5)) {
+    // See comment re CRM_Core_Payment::subscriptionUrl(), above.
+    $session->set('userID', $activeUser);
+  }
+
   return _sendReceipt($params);
 }
 

info.xml

@@ -21,6 +21,7 @@
     <ver>4.2</ver>
     <ver>4.3</ver>
     <ver>4.4</ver>
+    <ver>4.5</ver>
   </compatibility>
   <comments></comments>
     <civix>