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 aad1beeef625a4cf736430ef0c1abf96a031808e..131bca9f751dc90cb8ba170e88cdd872eb7d80a4 100644 (file)
--- 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 9a9b1362d99cba7ad4227ad41993c01592925fb6..8e0601ab57c20fd3c3dea3bf8a0322673da117f7 100644 (file)
--- 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
 ";