From: Margaret Epps <mepps@wikimedia.org>
Date: Thu, 14 Nov 2019 17:30:27 +0000 (-0500)
Subject: Handle possible null values in campaign dashboard orderByClause
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=02145d42eebdcd779785c0a1dd48e9de48463032;p=civicrm-core.git

Handle possible null values in campaign dashboard orderByClause
---

diff --git a/CRM/Campaign/BAO/Campaign.php b/CRM/Campaign/BAO/Campaign.php
index 50020a4007..ef9c13bc48 100644
--- a/CRM/Campaign/BAO/Campaign.php
+++ b/CRM/Campaign/BAO/Campaign.php
@@ -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']}";
     }