X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=CRM%2FCampaign%2FDAO%2FCampaignGroup.php;h=5c8ec894d4be4df252da6163493f52d08563298e;hb=a36434b96485cb086480c8deae0fe408b1ba1d01;hp=7262b441ac86a613cad6c472bf792c46ee5c2e16;hpb=d96bf18d5b1849cc8f21c8845706eaccc78db5f3;p=civicrm-core.git

diff --git a/CRM/Campaign/DAO/CampaignGroup.php b/CRM/Campaign/DAO/CampaignGroup.php
index 7262b441ac..5c8ec894d4 100644
--- a/CRM/Campaign/DAO/CampaignGroup.php
+++ b/CRM/Campaign/DAO/CampaignGroup.php
@@ -19,14 +19,14 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO {
    *
    * @var string
    */
-  static $_tableName = 'civicrm_campaign_group';
+  public static $_tableName = 'civicrm_campaign_group';
 
   /**
    * Should CiviCRM log any modifications to this table in the civicrm_log table.
    *
    * @var bool
    */
-  static $_log = FALSE;
+  public static $_log = FALSE;
 
   /**
    * Campaign Group id.
@@ -79,7 +79,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO {
    */
   public static function getReferenceColumns() {
     if (!isset(Civi::$statics[__CLASS__]['links'])) {
-      Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__);
+      Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__);
       Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'campaign_id', 'civicrm_campaign', 'id');
       Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Dynamic(self::getTableName(), 'entity_id', NULL, 'id', 'entity_table');
       CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']);
@@ -101,6 +101,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO {
           'title' => ts('Campaign Group ID'),
           'description' => ts('Campaign Group id.'),
           'required' => TRUE,
+          'where' => 'civicrm_campaign_group.id',
           'table_name' => 'civicrm_campaign_group',
           'entity' => 'CampaignGroup',
           'bao' => 'CRM_Campaign_DAO_CampaignGroup',
@@ -112,6 +113,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO {
           'title' => ts('Campaign'),
           'description' => ts('Foreign key to the activity Campaign.'),
           'required' => TRUE,
+          'where' => 'civicrm_campaign_group.campaign_id',
           'table_name' => 'civicrm_campaign_group',
           'entity' => 'CampaignGroup',
           'bao' => 'CRM_Campaign_DAO_CampaignGroup',
@@ -130,6 +132,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO {
           'description' => ts('Type of Group.'),
           'maxlength' => 8,
           'size' => CRM_Utils_Type::EIGHT,
+          'where' => 'civicrm_campaign_group.group_type',
           'default' => 'NULL',
           'table_name' => 'civicrm_campaign_group',
           'entity' => 'CampaignGroup',
@@ -149,6 +152,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO {
           'description' => ts('Name of table where item being referenced is stored.'),
           'maxlength' => 64,
           'size' => CRM_Utils_Type::BIG,
+          'where' => 'civicrm_campaign_group.entity_table',
           'default' => 'NULL',
           'table_name' => 'civicrm_campaign_group',
           'entity' => 'CampaignGroup',
@@ -160,6 +164,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_INT,
           'title' => ts('Entity ID'),
           'description' => ts('Entity id of referenced table.'),
+          'where' => 'civicrm_campaign_group.entity_id',
           'default' => 'NULL',
           'table_name' => 'civicrm_campaign_group',
           'entity' => 'CampaignGroup',