diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 7cf7932..7962015 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -1599,10 +1599,8 @@ function _drupal_bootstrap_configuration() { Unicode::check(); // Set the Drupal custom error handler. (requires \Drupal::config()) - if (!defined('MAINTENANCE_MODE') || MAINTENANCE_MODE !== 'install') { - set_error_handler('_drupal_error_handler'); - set_exception_handler('_drupal_exception_handler'); - } + set_error_handler('_drupal_error_handler'); + set_exception_handler('_drupal_exception_handler'); // Redirect the user to the installation script if Drupal has not been // installed yet (i.e., if no $databases array has been defined in the diff --git a/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php b/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php index c96d287..2389a62 100644 --- a/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php +++ b/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php @@ -7,7 +7,6 @@ namespace Drupal\Core\Installer; -use Drupal\Core\Database\Database; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\DependencyInjection\ServiceProviderInterface; use Drupal\Core\DependencyInjection\ServiceModifierInterface; diff --git a/core/modules/system/templates/install-page.html.twig b/core/modules/system/templates/install-page.html.twig index 45f37d2..ad1c04c 100644 --- a/core/modules/system/templates/install-page.html.twig +++ b/core/modules/system/templates/install-page.html.twig @@ -3,53 +3,53 @@ * @file * Default theme implementation to display a Drupal installation page. * - * All the available variables are mirrored in html.html.twig and - * page.html.twig. Some may be blank but they are provided for consistency. + * All available variables are mirrored in page.html.twig. + * Some may be blank but they are provided for consistency. * * @see template_preprocess_install_page() * * @ingroup themeable */ #} -

- + -

- {% if title %} -

- {% endif %} - {{ messages }} - {{ page.content }} -

+ {% if title %} +

+ {% endif %} + {{ messages }} + {{ page.content }} +

- {% if page.sidebar_first %} - {# /.l-sidebar-first #} - {% endif %} + {% if page.sidebar_first %} + {# /.l-sidebar-first #} + {% endif %} - {% if page.sidebar_second %} - {# /.l-sidebar-second #} - {% endif %} + {% if page.sidebar_second %} + {# /.l-sidebar-second #} + {% endif %} - {% if page.footer %} - - {% endif %} + {% if page.footer %} + + {% endif %} -

{# /.l-container #} +

{# /.l-container #} diff --git a/core/modules/system/templates/maintenance-page.html.twig b/core/modules/system/templates/maintenance-page.html.twig index b5275c7..3b5a59e 100644 --- a/core/modules/system/templates/maintenance-page.html.twig +++ b/core/modules/system/templates/maintenance-page.html.twig @@ -3,7 +3,7 @@ * @file * Default theme implementation to display a single Drupal page while offline. * - * All of the available variables are mirrored in html.html.twig. + * All available variables are mirrored in page.html.twig. * Some may be blank but they are provided for consistency. * * @see template_preprocess_maintenance_page() @@ -11,16 +11,6 @@ * @ingroup themeable */ #} - - - - {{ head }} - {{ head_title }} - {{ styles }} - {{ scripts }} - - -

{# /.l-container #} - - - diff --git a/core/themes/bartik/templates/maintenance-page.html.twig b/core/themes/bartik/templates/maintenance-page.html.twig index b29cafa..c885257 100644 --- a/core/themes/bartik/templates/maintenance-page.html.twig +++ b/core/themes/bartik/templates/maintenance-page.html.twig @@ -3,27 +3,13 @@ * @file * Bartik's theme implementation to display a single Drupal page while offline. * - * All of the available variables are mirrored in html.html.twig. + * All available variables are mirrored in page.html.twig. * * @see template_preprocess_maintenance_page() * * @ingroup themeable */ #} - - - - {{ head }} - {{ head_title }} - {{ styles }} - {{ scripts }} - - - - -

- - - diff --git a/core/themes/seven/templates/install-page.html.twig b/core/themes/seven/templates/install-page.html.twig index 85fc7e4..e7903e6 100644 --- a/core/themes/seven/templates/install-page.html.twig +++ b/core/themes/seven/templates/install-page.html.twig @@ -3,8 +3,7 @@ * @file * Seven theme implementation to display a Drupal installation page. * - * All the available variables are mirrored in html.html.twig and - * page.html.twig. + * All available variables are mirrored in page.html.twig. * Some may be blank but they are provided for consistency. * * @see template_preprocess_install_page() @@ -47,9 +46,9 @@ {# /.l-sidebar-second #} {% endif %} - {% if page.footer %} + {% if page.page_bottom %} {% endif %} diff --git a/core/themes/seven/templates/maintenance-page.html.twig b/core/themes/seven/templates/maintenance-page.html.twig index dc691c1..2170d36 100644 --- a/core/themes/seven/templates/maintenance-page.html.twig +++ b/core/themes/seven/templates/maintenance-page.html.twig @@ -3,26 +3,14 @@ * @file * Seven's theme implementation to display a single Drupal page while offline. * - * All of the available variables are mirrored in html.html.twig. + * All available variables are mirrored in page.html.twig. + * Some may be blank but they are provided for consistency. * * @see template_preprocess_maintenance_page() - * @see seven_preprocess_maintenance_page() * * @ingroup themeable */ #} - - - - {{ head_title }} - {{ head }} - {{ styles }} - {{ scripts }} - - - - {{ page_top }} -

{% if title %}

{% endif %} @@ -34,25 +22,22 @@ {% if logo %} ${{ site_name }}$ {% endif %} - {{ sidebar_first }} + {{ page.sidebar_first }}

{% if messages %}

{% endif %} - {% if help %} + {% if page.help %}

- {{ help }} + {{ page.help }}

{% endif %} - {{ content }} + {{ page.content }}

- - - diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig index 77dde87..2caeec2 100644 --- a/core/themes/seven/templates/page.html.twig +++ b/core/themes/seven/templates/page.html.twig @@ -50,13 +50,13 @@ * comment/reply/12345). * * Regions: - * - page.header: Items for the header region. + * - page.page_top: Items for the header region. * - page.highlighted: Items for the highlighted content region. * - page.help: Dynamic help text, mostly for admin pages. * - page.content: The main content of the current page. * - page.sidebar_first: Items for the first sidebar. * - page.sidebar_second: Items for the second sidebar. - * - page.footer: Items for the footer region. + * - page.page_bottom: Items for the footer region. * * @see template_preprocess_page() * @see seven_preprocess_page()

{{ site_name }}

{{ site_name }}

{{ title }}

{{ title }}

{{ title }}