Merge pull request #14204 from totten/5.14-act-sort
authorSeamus Lee <seamuslee001@gmail.com>
Mon, 6 May 2019 20:36:27 +0000 (06:36 +1000)
committerGitHub <noreply@github.com>
Mon, 6 May 2019 20:36:27 +0000 (06:36 +1000)
(dev/core#934; followup) Fix escaping on new query code

api/v3/Activity.php

index de4d1ba783a92d70dc264d0afb23d902c1e7e3a1..89402415080ab20af25349c347c453849845280f 100644 (file)
@@ -363,8 +363,9 @@ function _civicrm_activity_get_handleSourceContactNameOrderBy(&$params, &$option
     $sql->join(
       'source_contact',
       "LEFT JOIN
-      civicrm_activity_contact ac ON (ac.activity_id = a.id AND record_type_id = $sourceContactID )
-       LEFT JOIN civicrm_contact c ON c.id = ac.contact_id"
+      civicrm_activity_contact ac ON (ac.activity_id = a.id AND record_type_id = #sourceContactID)
+       LEFT JOIN civicrm_contact c ON c.id = ac.contact_id",
+      ['sourceContactID' => $sourceContactID]
     );
     $sql->orderBy("c.display_name $order");
     unset($options['sort'], $params['options']['sort']);