Merge pull request civicrm#31073 from civicrm/5.78

5.78
demeritcowboy · Sep 8, 2024 · 6ce3779 · 6ce3779
2 parents 24557ce + 9029d19
commit 6ce3779
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/CRM/Extension/Browser.php b/CRM/Extension/Browser.php
@@ -224,7 +224,9 @@ private function grabRemoteJson() {
     catch (GuzzleException $e) {
       throw new CRM_Extension_Exception(ts('The CiviCRM public extensions directory at %1 could not be contacted - please check your webserver can make external HTTP requests', [1 => $this->getRepositoryUrl()]), 'connection_error');
     }
-    restore_error_handler();
+    finally {
+      restore_error_handler();
+    }
 
     if ($response->getStatusCode() !== 200) {
       throw new CRM_Extension_Exception(ts('The CiviCRM public extensions directory at %1 could not be contacted - please check your webserver can make external HTTP requests', [1 => $this->getRepositoryUrl()]), 'connection_error');