Handle possible null values in campaign dashboard orderByClause
authorMargaret Epps <mepps@wikimedia.org>
Thu, 14 Nov 2019 17:30:27 +0000 (12:30 -0500)
committerMargaret Epps <mepps@wikimedia.org>
Thu, 14 Nov 2019 17:30:27 +0000 (12:30 -0500)
CRM/Campaign/BAO/Campaign.php

index 50020a4007c7ba175f95769fbfadd83d4718aee8..ef9c13bc4835525aaf757e66b1b0e37a3008d381 100644 (file)
@@ -399,7 +399,7 @@ INNER JOIN civicrm_option_group grp ON ( campaign_type.option_group_id = grp.id
       if ($orderOnCampaignTable) {
         $orderByClause = "ORDER BY campaign.{$sortParams['sort']} {$sortParams['sortOrder']}";
       }
-      $orderByClause .= ", campaign.id {$sortParams['sortOrder']}";
+      $orderByClause = ( $orderByClause ) ?  $orderByClause . ", campaign.id {$sortParams['sortOrder']}" : $orderByClause;
       $limitClause = "LIMIT {$sortParams['offset']}, {$sortParams['rowCount']}";
     }