From: Dave Greenberg <dave@civicrm.org>
Date: Mon, 28 Apr 2014 20:49:26 +0000 (-0700)
Subject: Merge pull request #2909 from jake-mw/crm-14472
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6de877255b5e0807eb4b6c660f6d013bd0d2a961;hp=848a2a3a2f1fa3aec2f8e2a2751da5ba39815451;p=civicrm-core.git

Merge pull request #2909 from jake-mw/crm-14472

CRM-14472 - query correct table for contribution-type vs. event-type PCPs
---

diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index d10afbfdd6..102924e765 100644
--- a/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@ -227,7 +227,12 @@ class CRM_Contact_Page_AJAX {
             SELECT pcp.id as id, CONCAT_WS( ' :: ', {$select} ) as data, sort_name
             FROM civicrm_pcp pcp, civicrm_contribution_page cp, civicrm_contact cc
             {$includeEmailFrom}
-            {$whereClause}
+            {$whereClause} AND pcp.page_type = 'contribute'
+            UNION ALL
+            SELECT pcp.id as id, CONCAT_WS( ' :: ', {$select} ) as data, sort_name
+            FROM civicrm_pcp pcp, civicrm_event cp, civicrm_contact cc
+            {$includeEmailFrom}
+            {$whereClause} AND pcp.page_type = 'event'
             LIMIT 0, {$limit}
             ) t
         ORDER BY sort_name