Skip to content
Snippets Groups Projects
Unverified Commit c2a4149b authored by Eileen McNaughton's avatar Eileen McNaughton Committed by GitHub
Browse files

Merge pull request #15434 from civicrm/5.19

5.19 to master
parents 7f58fa4a 41c0e58a
Branches
Tags
No related merge requests found
......@@ -104,11 +104,19 @@ abstract class CRM_Utils_Check_Component {
* @throws \Civi\API\Exception\UnauthorizedException
*/
public function isDisabled($method) {
$checks = $this->getChecksConfig();
if (!empty($checks[$method])) {
return (bool) empty($checks[$method]['is_active']);
try {
$checks = $this->getChecksConfig();
if (!empty($checks[$method])) {
return (bool) empty($checks[$method]['is_active']);
}
}
catch (PEAR_Exception $e) {
// if we're hitting this, DB migration to 5.19 probably hasn't run yet, so
// is_active doesn't exist. Ignore this error so the status check (which
// might warn about missing migrations!) still renders.
// TODO: remove at some point after 5.19
}
return FALSE;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment