Skip to content

Commit

Permalink
dev/core#560 Remove unnecessary CRM_Core_Error::fatal call
Browse files Browse the repository at this point in the history
  • Loading branch information
seamuslee001 committed Jun 7, 2020
1 parent ec5908f commit 57755d6
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions civicrm.module
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ define('CIVICRM_UF_HEAD', TRUE);
* @see CiviDrupal\PhpVersionTest::testConstantMatch()
*/
define('CIVICRM_DRUPAL_PHP_MINIMUM', '7.1.0');
define('CIVICRM_DRUPAL_MYSQL_MINIMUM', '5.5');
define('CIVICRM_DRUPAL_NEXT_MYSQL_MINIMUM', '5.6.5');

/**
* Adds CiviCRM CSS and JS resources into the header.
Expand Down Expand Up @@ -600,12 +602,7 @@ function civicrm_form_data($edit, &$user, $category, $reset, $doNotProcess = FAL
}
}
$ctype = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $userID, 'contact_type');
try {
$profileID = _civicrm_get_user_profile_id($category, $userID, $ctype);
}
catch (Exception $e) {
CRM_Core_Error::fatal($e->getMessage());
}
$profileID = _civicrm_get_user_profile_id($category, $userID, $ctype);

$html = CRM_Core_BAO_UFGroup::getEditHTML($userID, $category, NULL, FALSE, $reset, $profileID, $doNotProcess, $ctype);

Expand Down

0 comments on commit 57755d6

Please sign in to comment.