projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #11101 from JohnFF/feature/CRM-16243-sprint-b
[civicrm-core.git]
/
sql
/
GenerateReportData.php
diff --git
a/sql/GenerateReportData.php
b/sql/GenerateReportData.php
index fe5fbe3d7d9fc6df0a96916fa9bc4812f2ff695d..6119aff6bf28873f2efe7013be01f053453ae8ac 100644
(file)
--- a/
sql/GenerateReportData.php
+++ b/
sql/GenerateReportData.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
6
|
+ | Copyright CiviCRM LLC (c) 2004-201
7
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
6
+ * @copyright CiviCRM LLC (c) 2004-201
7
* $Id$
*
*/
* $Id$
*
*/
@@
-1188,7
+1188,7
@@
class CRM_GCD {
$contactDAO->find();
$count = 0;
$contactDAO->find();
$count = 0;
- $activityContacts = CRM_
Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'nam
e');
+ $activityContacts = CRM_
Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validat
e');
while ($contactDAO->fetch()) {
if ($count++ > 2) {
while ($contactDAO->fetch()) {
if ($count++ > 2) {