From: atif-shaikh <shaikh388@gmail.com>
Date: Thu, 15 Jan 2015 09:48:05 +0000 (+0530)
Subject: CRM-15826 - CiviCase core bugs
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b0e74adce7580abe4e36373df9f39a8ef14dcb68;p=civicrm-core.git

CRM-15826 - CiviCase core bugs

https://issues.civicrm.org/jira/browse/CRM-15826
---

diff --git a/CRM/Core/Transaction.php b/CRM/Core/Transaction.php
index aad1beeef6..131bca9f75 100644
--- a/CRM/Core/Transaction.php
+++ b/CRM/Core/Transaction.php
@@ -248,6 +248,7 @@ class CRM_Core_Transaction {
    */
   static public function addCallback($phase, $callback, $params = NULL, $id = NULL) {
     $frame = \Civi\Core\Transaction\Manager::singleton()->getBaseFrame();
+    if (empty($frame)) return NULL;
     $frame->addCallback($phase, $callback, $params, $id);
   }
 }
diff --git a/CRM/Report/Form/Case/Summary.php b/CRM/Report/Form/Case/Summary.php
index 9a9b1362d9..8e0601ab57 100644
--- a/CRM/Report/Form/Case/Summary.php
+++ b/CRM/Report/Form/Case/Summary.php
@@ -261,7 +261,7 @@ inner join civicrm_contact $c2 on ${c2}.id=${ccc}.contact_id
     }
     else {
       $this->_from = "
-            FROM civicrm_case $cc
+            FROM civicrm_contact $c, civicrm_case $cc
 inner join civicrm_case_contact $ccc on ${ccc}.case_id = ${cc}.id
 inner join civicrm_contact $c2 on ${c2}.id=${ccc}.contact_id
 ";