Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CRM/Activityical/Form/Details.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function buildQuickForm() {
try {
$result = _activityical_civicrmapi('contact', 'get', $api_params, FALSE);
}
catch (CiviCRM_API3_Exception $e) {
catch (CRM_Core_Exception $e) {
CRM_Core_Error::statusBounce($not_found_error);
}
if (empty($result['id'])) {
Expand Down
4 changes: 2 additions & 2 deletions activityical.php
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ function _activityical_get_max_navID(&$menu, &$max_navID = NULL) {
/**
* Log CiviCRM API errors to CiviCRM log.
*/
function _activityical_log_api_error(CiviCRM_API3_Exception $e, string $entity, string $action, array $params) {
function _activityical_log_api_error(CRM_Core_Exception $e, string $entity, string $action, array $params) {
$message = "CiviCRM API Error '{$entity}.{$action}': " . $e->getMessage() . '; ';
$message .= "API parameters when this error happened: " . json_encode($params) . '; ';
$bt = debug_backtrace();
Expand All @@ -264,7 +264,7 @@ function _activityical_civicrmapi(string $entity, string $action, array $params,
try {
$result = civicrm_api3($entity, $action, $params);
}
catch (CiviCRM_API3_Exception $e) {
catch (CRM_Core_Exception $e) {
_activityical_log_api_error($e, $entity, $action, $params);
if (!$silence_errors) {
throw $e;
Expand Down
10 changes: 5 additions & 5 deletions api/v3/ActivityicalCache.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function _civicrm_api3_activityical_cache_create_spec(&$spec) {
*
* @param array $params
* @return array API result descriptor
* @throws API_Exception
* @throws CRM_Core_Exception
*/
function civicrm_api3_activityical_cache_create($params) {
return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
Expand All @@ -28,7 +28,7 @@ function civicrm_api3_activityical_cache_create($params) {
*
* @param array $params
* @return array API result descriptor
* @throws API_Exception
* @throws CRM_Core_Exception
*/
function civicrm_api3_activityical_cache_delete($params) {
return _civicrm_api3_basic_delete(_civicrm_api3_get_BAO(__FUNCTION__), $params);
Expand All @@ -39,7 +39,7 @@ function civicrm_api3_activityical_cache_delete($params) {
*
* @param array $params
* @return array API result descriptor
* @throws API_Exception
* @throws CRM_Core_Exception
*/
function civicrm_api3_activityical_cache_get($params) {
return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
Expand All @@ -50,15 +50,15 @@ function civicrm_api3_activityical_cache_get($params) {
*
* @param array $params
* @return array API result descriptor
* @throws API_Exception
* @throws CRM_Core_Exception
*/
function civicrm_api3_activityical_cache_clearall($params) {
$dao_name = _civicrm_api3_activityical_cache_DAO();
$dao = new $dao_name();
$dao->whereAdd('1');
$result = $dao->delete(DB_DATAOBJECT_WHEREADD_ONLY);
if ($result === FALSE) {
throw new API_Exception('Could not delete all cache entries.');
throw new CRM_Core_Exception('Could not delete all cache entries.');
}
return civicrm_api3_create_success($result, array(), 'activityical_cach', 'clearall');
}
Expand Down
6 changes: 3 additions & 3 deletions api/v3/ActivityicalContact.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function _civicrm_api3_activityical_contact_create_spec(&$spec) {
*
* @param array $params
* @return array API result descriptor
* @throws API_Exception
* @throws CRM_Core_Exception
*/
function civicrm_api3_activityical_contact_create($params) {
return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
Expand All @@ -28,7 +28,7 @@ function civicrm_api3_activityical_contact_create($params) {
*
* @param array $params
* @return array API result descriptor
* @throws API_Exception
* @throws CRM_Core_Exception
*/
function civicrm_api3_activityical_contact_delete($params) {
return _civicrm_api3_basic_delete(_civicrm_api3_get_BAO(__FUNCTION__), $params);
Expand All @@ -39,7 +39,7 @@ function civicrm_api3_activityical_contact_delete($params) {
*
* @param array $params
* @return array API result descriptor
* @throws API_Exception
* @throws CRM_Core_Exception
*/
function civicrm_api3_activityical_contact_get($params) {
return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
Expand Down