summaryrefslogtreecommitdiffstats
path: root/core/authorize.php
diff options
context:
space:
mode:
authorNathaniel Catchpole2016-05-16 12:05:48 (GMT)
committerNathaniel Catchpole2016-05-16 12:05:48 (GMT)
commita9666b4ae85300ff9106144421a6582732c8f6cb (patch)
tree18826e4fc8dcd2ff9ec9ca578acdf6b96a99c4c2 /core/authorize.php
parentfe6b686153f5e31b974118d6887faf79cfa7e94e (diff)
Issue #842620 by alexpott, hansfn, BondD, jurjenn, Skin, xjm, hitesh-jain, solidwebcode: Update manager can't install modules using FTP due broken FileTransferAuthorizeForm
Diffstat (limited to 'core/authorize.php')
-rw-r--r--core/authorize.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/authorize.php b/core/authorize.php
index 4752799..073770a 100644
--- a/core/authorize.php
+++ b/core/authorize.php
@@ -21,6 +21,7 @@
*/
use Drupal\Core\DrupalKernel;
+use Drupal\Core\Form\EnforcedResponseException;
use Drupal\Core\Url;
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
use Symfony\Component\HttpFoundation\Request;
@@ -169,7 +170,13 @@ if ($is_allowed) {
}
elseif (!$batch = batch_get()) {
// We have a batch to process, show the filetransfer form.
- $content = \Drupal::formBuilder()->getForm('Drupal\Core\FileTransfer\Form\FileTransferAuthorizeForm');
+ try {
+ $content = \Drupal::formBuilder()->getForm('Drupal\Core\FileTransfer\Form\FileTransferAuthorizeForm');
+ }
+ catch (EnforcedResponseException $e) {
+ $e->getResponse()->send();
+ exit;
+ }
}
}
// We defer the display of messages until all operations are done.