Merge pull request #6414 from eileenmcnaughton/CRM-16967

[civicrm-core.git] / CRM / Core / TableHierarchy.php

diff --git a/CRM/Core/TableHierarchy.php b/CRM/Core/TableHierarchy.php
index 7e050e15e6e5c2ceec916e3fa00bd91a9438ee48..0c9478f3f1838f7e3383b328dd0229a990458aef 100644 (file)
--- a/CRM/Core/TableHierarchy.php
+++ b/CRM/Core/TableHierarchy.php
@@ -1,10 +1,9 @@
 <?php
-
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -24,13 +23,13 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Class representing the table relationships
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -39,7 +38,6 @@ class CRM_Core_TableHierarchy {
   /**
    * This array defines weights for table, which are used to sort array of table in from clause
    * @var array
-   * @static
    */
   static $info = array(
     'civicrm_contact' => '01',
@@ -53,39 +51,40 @@ class CRM_Core_TableHierarchy {
     'civicrm_openid' => '17',
     'civicrm_location_type' => '18',
     'civicrm_group_contact' => '19',
-    'civicrm_group' => '20',
-    'civicrm_subscription_history' => '21',
-    'civicrm_entity_tag' => '22',
-    'civicrm_note' => '23',
-    'civicrm_contribution' => '24',
-    'civicrm_financial_type'    => '25',
-    'civicrm_participant' => '26',
-    'civicrm_event' => '27',
-    'civicrm_worldregion' => '28',
-    'civicrm_case_contact' => '29',
-    'civicrm_case' => '30',
-    'case_relationship' => '31',
-    'case_relation_type' => '32',
-    'civicrm_activity' => '33',
-    'civicrm_mailing_summary' => '34',
-    'civicrm_mailing_recipients' => '35',
-    'civicrm_mailing' => '36',
-    'civicrm_mailing_job' => '37',
-    'civicrm_mailing_event_queue' => '38',
-    'civicrm_mailing_event_bounce' => '39',
-    'civicrm_mailing_event_opened' => '40',
-    'civicrm_mailing_event_reply' => '41',
-    'civicrm_mailing_event_trackable_url_open' => '42',
+    'civicrm_group_contact_cache' => '20',
+    'civicrm_group' => '21',
+    'civicrm_subscription_history' => '22',
+    'civicrm_entity_tag' => '23',
+    'civicrm_note' => '24',
+    'civicrm_contribution' => '25',
+    'civicrm_financial_type' => '26',
+    'civicrm_participant' => '27',
+    'civicrm_event' => '28',
+    'civicrm_worldregion' => '29',
+    'civicrm_case_contact' => '30',
+    'civicrm_case' => '31',
+    'case_relationship' => '32',
+    'case_relation_type' => '33',
+    'civicrm_activity' => '34',
+    'civicrm_mailing_summary' => '35',
+    'civicrm_mailing_recipients' => '36',
+    'civicrm_mailing' => '37',
+    'civicrm_mailing_job' => '38',
+    'civicrm_mailing_event_queue' => '39',
+    'civicrm_mailing_event_bounce' => '40',
+    'civicrm_mailing_event_opened' => '41',
+    'civicrm_mailing_event_reply' => '42',
+    'civicrm_mailing_event_trackable_url_open' => '43',
   );
 
   /**
    * @return array
    */
-  static function &info() {
+  public static function &info() {
     //get the campaign related tables.
     CRM_Campaign_BAO_Query::info(self::$info);
 
     return self::$info;
   }
-}
 
+}