diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index ca64b35..dfd0d28 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -2127,15 +2127,6 @@ function _drupal_bootstrap_kernel() { $kernel = new DrupalKernel('prod', FALSE, drupal_classloader()); $kernel->boot(); } - // Set the allowed protocols once we have the config available. - $allowed_protocols = \Drupal::config('system.filter')->get('protocols'); - if (!isset($allowed_protocols)) { - // filter_xss_admin() is called by the installer and update.php, in which - // case the configuration may not exist (yet). Provide a minimal default set - // of allowed protocols for these cases. - $allowed_protocols = array('http', 'https'); - } - Url::setAllowedProtocols($allowed_protocols); } /** diff --git a/core/includes/common.inc b/core/includes/common.inc index 96e6bd3..b145058 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -4355,6 +4355,16 @@ function _drupal_bootstrap_code() { ini_set('log_errors', 1); ini_set('error_log', 'public://error.log'); } + + // Set the allowed protocols once we have the config available. + $allowed_protocols = \Drupal::config('system.filter')->get('protocols'); + if (!isset($allowed_protocols)) { + // filter_xss_admin() is called by the installer and update.php, in which + // case the configuration may not exist (yet). Provide a minimal default set + // of allowed protocols for these cases. + $allowed_protocols = array('http', 'https'); + } + Url::setAllowedProtocols($allowed_protocols); } /**