From: Tim Otten Date: Fri, 13 Sep 2013 23:11:40 +0000 (-0700) Subject: CRM_Case_BAO_Case - Every call to Error::ignoreException should have matching call... X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a19fc402a7b4a9d118f9b3d40987e17056625ae8;p=civicrm-core.git CRM_Case_BAO_Case - Every call to Error::ignoreException should have matching call to Error::setCallback --- diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php index d844b81c05..27b3324a8f 100644 --- a/CRM/Case/BAO/Case.php +++ b/CRM/Case/BAO/Case.php @@ -3095,17 +3095,20 @@ WHERE id IN (' . implode(',', $copiedActivityIds) . ')'; * Used during case component enablement and during ugprade */ static function createCaseViews() { + $dao = new CRM_Core_DAO(); + $sql = self::createCaseViewsQuery('upcoming'); CRM_Core_Error::ignoreException(); - $dao = new CRM_Core_DAO(); $dao->query($sql); + CRM_Core_Error::setCallback(); if (PEAR::getStaticProperty('DB_DataObject', 'lastError')) { - CRM_Core_Error::setCallback(); return FALSE; } // Above error doesn't get caught? + CRM_Core_Error::ignoreException(); $doublecheck = $dao->singleValueQuery("SELECT count(id) FROM civicrm_view_case_activity_upcoming"); + CRM_Core_Error::setCallback(); if (is_null($doublecheck)) { return FALSE; } @@ -3113,13 +3116,15 @@ WHERE id IN (' . implode(',', $copiedActivityIds) . ')'; $sql = self::createCaseViewsQuery('recent'); CRM_Core_Error::ignoreException(); $dao->query($sql); + CRM_Core_Error::setCallback(); if (PEAR::getStaticProperty('DB_DataObject', 'lastError')) { - CRM_Core_Error::setCallback(); return FALSE; } // Above error doesn't get caught? + CRM_Core_Error::ignoreException(); $doublecheck = $dao->singleValueQuery("SELECT count(id) FROM civicrm_view_case_activity_recent"); + CRM_Core_Error::setCallback(); if (is_null($doublecheck)) { return FALSE; }