Merge pull request #5479 from eileenmcnaughton/4.6

[civicrm-core.git] / CRM / Core / BAO / Log.php

diff --git a/CRM/Core/BAO/Log.php b/CRM/Core/BAO/Log.php
index e342a6486b366726296cad4884a62ca3ba41845c..a97eb547326036b25717ff159716365ddcaa34bd 100644 (file)
--- a/CRM/Core/BAO/Log.php
+++ b/CRM/Core/BAO/Log.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -67,12 +67,11 @@ class CRM_Core_BAO_Log extends CRM_Core_DAO_Log {
   }
 
   /**
-   * Add log to civicrm_log table
+   * Add log to civicrm_log table.
    *
    * @param array $params
    *   Array of name-value pairs of log table.
    *
-   * @static
    */
   public static function add(&$params) {
 
@@ -87,7 +86,7 @@ class CRM_Core_BAO_Log extends CRM_Core_DAO_Log {
    * @param int $tableID
    * @param int $userID
    */
-  static function register(
+  public static function register(
     $contactID,
     $tableName,
     $tableID,
@@ -133,11 +132,11 @@ class CRM_Core_BAO_Log extends CRM_Core_DAO_Log {
 
     $logData = "$tableName,$tableID";
     if (!$log->id) {
-      $log->entity_table  = 'civicrm_contact';
-      $log->entity_id     = $contactID;
-      $log->modified_id   = $userID;
+      $log->entity_table = 'civicrm_contact';
+      $log->entity_id = $contactID;
+      $log->modified_id = $userID;
       $log->modified_date = date("YmdHis");
-      $log->data          = $logData;
+      $log->data = $logData;
       $log->save();
     }
     else {
@@ -153,13 +152,12 @@ UPDATE civicrm_log
   }
 
   /**
-   * Get log record count for a Contact
+   * Get log record count for a Contact.
    *
    * @param int $contactID
    *
    * @return int
    *   count of log records
-   * @static
    */
   public static function getContactLogCount($contactID) {
     $query = "SELECT count(*) FROM civicrm_log
@@ -168,12 +166,11 @@ UPDATE civicrm_log
   }
 
   /**
-   * Function for find out whether to use logging schema entries for contact
+   * Function for find out whether to use logging schema entries for contact.
    * summary, instead of normal log entries.
    *
    * @return int
    *   report id of Contact Logging Report (Summary) / false
-   * @static
    */
   public static function useLoggingReport() {
     // first check if logging is enabled
@@ -200,4 +197,5 @@ UPDATE civicrm_log
 
     return FALSE;
   }
+
 }