Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-16-18-06-10

[civicrm-core.git] / CRM / Logging / ReportDetail.php

diff --git a/CRM/Logging/ReportDetail.php b/CRM/Logging/ReportDetail.php
index 489eb3c1b5aee479785424be9b28340a0325d4c4..d76664fb78f5dcf55ce4c3ff5c6d3cd2b9aecaf5 100644 (file)
--- a/CRM/Logging/ReportDetail.php
+++ b/CRM/Logging/ReportDetail.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -70,25 +70,24 @@ class CRM_Logging_ReportDetail extends CRM_Report_Form {
     parent::__construct();
 
     CRM_Utils_System::resetBreadCrumb();
-    $breadcrumb =
+    $breadcrumb = array(
+      array(
+        'title' => ts('Home'),
+        'url' => CRM_Utils_System::url(),
+      ),
+      array(
+        'title' => ts('CiviCRM'),
+        'url' => CRM_Utils_System::url('civicrm', 'reset=1'),
+      ),
       array(
-        array(
-          'title' => ts('Home'),
-          'url' => CRM_Utils_System::url()
-        ),
-        array(
-          'title' => ts('CiviCRM'),
-          'url' => CRM_Utils_System::url('civicrm', 'reset=1')
-        ),
-        array(
-          'title' => ts('View Contact'),
-          'url' => CRM_Utils_System::url('civicrm/contact/view', "reset=1&cid={$this->cid}")
-        ),
-        array(
-          'title' => ts('Search Results'),
-          'url' => CRM_Utils_System::url('civicrm/contact/search', "force=1")
-        ),
-      );
+        'title' => ts('View Contact'),
+        'url' => CRM_Utils_System::url('civicrm/contact/view', "reset=1&cid={$this->cid}"),
+      ),
+      array(
+        'title' => ts('Search Results'),
+        'url' => CRM_Utils_System::url('civicrm/contact/search', "force=1"),
+      ),
+    );
     CRM_Utils_System::appendBreadCrumb($breadcrumb);
 
     if (CRM_Utils_Request::retrieve('revert', 'Boolean', CRM_Core_DAO::$_nullObject)) {
@@ -105,7 +104,7 @@ class CRM_Logging_ReportDetail extends CRM_Report_Form {
 
     // make sure the report works even without the params
     if (!$this->log_conn_id or !$this->log_date) {
-      $dao = new CRM_Core_DAO;
+      $dao = new CRM_Core_DAO();
       $dao->query("SELECT log_conn_id, log_date FROM `{$this->db}`.log_{$this->tables[0]} WHERE log_action = 'Update' ORDER BY log_date DESC LIMIT 1");
       $dao->fetch();
       $this->log_conn_id = $dao->log_conn_id;
@@ -240,6 +239,7 @@ class CRM_Logging_ReportDetail extends CRM_Report_Form {
 
     $q = "reset=1&log_conn_id={$this->log_conn_id}&log_date={$this->log_date}";
     $this->assign('revertURL', CRM_Report_Utils_Report::getNextUrl($this->detail, "$q&revert=1", FALSE, TRUE));
-    $this->assign('revertConfirm', ts('Are you sure you want to revert all these changes?'));
+    $this->assign('revertConfirm', ts('Are you sure you want to revert all changes?'));
   }
+
 }