From f2461bb7e9eafd60b71d54a8f033eb2aaef13b38 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 9 Oct 2020 11:55:24 +0200
Subject: [PATCH] ImportsourceController: catch the whole block

---
 .../controllers/ImportsourceController.php    | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/application/controllers/ImportsourceController.php b/application/controllers/ImportsourceController.php
index b1eb1643..688649c8 100644
--- a/application/controllers/ImportsourceController.php
+++ b/application/controllers/ImportsourceController.php
@@ -172,23 +172,22 @@ class ImportsourceController extends ActionController
      */
     public function fetchAction()
     {
-        $source = $this->getImportSource();
-        $source->checkForChanges();
-        $hook = ImportSourceHook::forImportSource($source);
-        $data = $hook->fetchData();
-        $source->applyModifiers($data);
-
-
-        $filename = sprintf(
-            "director-importsource-%d_%s.json",
-            $this->getParam('id'),
-            date('YmdHis')
-        );
-        $response = $this->getResponse();
-        $response->setHeader('Content-Type', 'application/json', true);
-        $response->setHeader('Content-disposition', "attachment; filename=$filename", true);
-        $response->sendHeaders();
         try {
+            $source = $this->getImportSource();
+            $source->checkForChanges();
+            $hook = ImportSourceHook::forImportSource($source);
+            $data = $hook->fetchData();
+            $source->applyModifiers($data);
+
+            $filename = sprintf(
+                "director-importsource-%d_%s.json",
+                $this->getParam('id'),
+                date('YmdHis')
+            );
+            $response = $this->getResponse();
+            $response->setHeader('Content-Type', 'application/json', true);
+            $response->setHeader('Content-disposition', "attachment; filename=$filename", true);
+            $response->sendHeaders();
             $this->sendJson($this->getResponse(), $data);
         } catch (Exception $e) {
             $this->sendJsonError($response, $e->getMessage());