From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 11 Jan 2021 21:40:37 +0000 (+1300)
Subject: Merge pull request #19323 from seamuslee001/default_handler_exception
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=01924a097c57fec0c8feac8cec23b7a829be4415;p=civicrm-core.git

Merge pull request #19323 from seamuslee001/default_handler_exception

REF Update CiviCRM default PEAR Error handling to be exception rather…
---

01924a097c57fec0c8feac8cec23b7a829be4415
diff --cc CRM/Core/Config.php
index 6fe7137e33,7f4bdd0268..b11fc554e2
--- a/CRM/Core/Config.php
+++ b/CRM/Core/Config.php
@@@ -86,9 -86,13 +86,9 @@@ class CRM_Core_Config extends CRM_Core_
     */
    public static function &singleton($loadFromDB = TRUE, $force = FALSE) {
      if (self::$_singleton === NULL || $force) {
-       $GLOBALS['civicrm_default_error_scope'] = CRM_Core_TemporaryErrorScope::create(['CRM_Core_Error', 'handle']);
+       $GLOBALS['civicrm_default_error_scope'] = CRM_Core_TemporaryErrorScope::create(['CRM_Core_Error', 'exceptionHandler'], 1);
        $errorScope = CRM_Core_TemporaryErrorScope::create(['CRM_Core_Error', 'simpleHandler']);
  
 -      if (defined('E_DEPRECATED')) {
 -        error_reporting(error_reporting() & ~E_DEPRECATED);
 -      }
 -
        self::$_singleton = new CRM_Core_Config();
        \Civi\Core\Container::boot($loadFromDB);
        if ($loadFromDB && self::$_singleton->dsn) {