Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-03-23-46-36

Conflicts:
	CRM/Activity/Page/AJAX.php
	CRM/Member/Form/Membership.php
	js/rest.js
	templates/CRM/Campaign/Form/Task/Interview.tpl

diff --cc CRM/Activity/Page/AJAX.php
index 7e5906545d26ba068c5104ce083bce1cd51dd2d5,6b99fee34b1ee656e80884b4fde6421bed6bf6a3..999b07ab0eb58ccbb2626d0cdf73a3f56627ba3a
--- 1/CRM/Activity/Page/AJAX.php
--- 2/CRM/Activity/Page/AJAX.php
+++ b/CRM/Activity/Page/AJAX.php
@@@ -248,17 -248,16 +248,17 @@@ class CRM_Activity_Page_AJAX 
      // set user name, email and edit columns links
      // idx will count number of current row / needed by edit links
      $idx = 1;
 -    foreach ($caseRelationships as $key => $row) {
 +    foreach ($caseRelationships as &$row) {
 +      // Get rid of the "<br />(Case Manager)" from label
 +      list($typeLabel) = explode('<', $row['relation']);
        // view user links
 -      if ($caseRelationships[$key]['cid']) {
 -        $caseRelationships[$key]['name'] = '<a href='.CRM_Utils_System::url('civicrm/contact/view',
 -          'action=view&reset=1&cid='.$caseRelationships[$key]['cid']).'>'.$caseRelationships[$key]['name'].'</a>';
 +      if ($row['cid']) {
 +        $row['name'] = '<a class="view-contact" title="'. ts('View Contact') .'" href='.CRM_Utils_System::url('civicrm/contact/view',
 +          'action=view&reset=1&cid='.$row['cid']).'>'.$row['name'].'</a>';
        }
        // email column links/icon
 -      if ($caseRelationships[$key]['email']) {
 -        $caseRelationships[$key]['email'] = '<a href="'.CRM_Utils_System::url('civicrm/contact/view/activity', 'action=reset=1&action=add&atype=3&cid='.$caseRelationships[$key]['cid']).'&caseid='.$caseID.'" title="compose and send an email"><div class="icon email-icon" title="compose and send an email"></div>
 -             </a>';
 +      if ($row['email']) {
-         $row['email'] = '<a class="crm-hover-button crm-popup" href="'.CRM_Utils_System::url('civicrm/activity/email/add', 'reset=1&action=add&atype=3&cid='.$row['cid']).'" title="'. ts('Send an Email') . '"><span class="icon email-icon"></span></a>';
++        $row['email'] = '<a class="crm-hover-button crm-popup" href="'.CRM_Utils_System::url('civicrm/activity/email/add', 'reset=1&action=add&atype=3&cid='.$row['cid']).'&caseid='.$caseID.'" title="'. ts('Send an Email') . '"><span class="icon email-icon"></span></a>';
        }
        // edit links
        if ($hasAccessToAllCases) {

diff --cc CRM/Core/Payment/eWAY.php
Simple merge

diff --cc CRM/Price/Form/Option.php
Simple merge

diff --cc CRM/Profile/Selector/Listings.php
Simple merge

diff --cc CRM/Utils/System/Drupal.php
Simple merge

diff --cc CRM/Utils/System/Drupal6.php
Simple merge

diff --cc api/v3/Activity.php
Simple merge

diff --cc api/v3/Contribution.php
Simple merge

diff --cc api/v3/Job.php
Simple merge

diff --cc templates/CRM/Campaign/Form/Task/Interview.tpl
Simple merge