diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 9d7bd89f64..41cc43697c 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -302,12 +302,6 @@ function install_begin_request($class_loader, &$install_state) { // Allow command line scripts to override server variables used by Drupal. require_once __DIR__ . '/bootstrap.inc'; - // Before having installed the system module and being able to do a module - // rebuild, prime the drupal_get_filename() static cache with the system - // module's location. - // @todo Remove as part of https://www.drupal.org/node/2186491 - drupal_get_filename('module', 'system', 'core/modules/system/system.info.yml'); - // If the hash salt leaks, it becomes possible to forge a valid testing user // agent, install a new copy of Drupal, and take over the original site. // The user agent header is used to pass a database prefix in the request when @@ -445,6 +439,12 @@ function install_begin_request($class_loader, &$install_state) { } } + // Before having installed the system module and being able to do a module + // rebuild, prime the drupal_get_filename() static cache with the system + // module's location. + // @todo Remove as part of https://www.drupal.org/node/2186491 + drupal_get_filename('module', 'system', 'core/modules/system/system.info.yml'); + // Use the language from the profile configuration, if available, to override // the language previously set in the parameters. if (isset($install_state['profile_info']['distribution']['langcode'])) { diff --git a/core/includes/install.inc b/core/includes/install.inc index 3db6bf5789..afa092f439 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -623,7 +623,7 @@ function drupal_install_system($install_state) { // exact location. // @todo Try to install system as any other module, see // https://www.drupal.org/node/2719315. - \Drupal::service('extension.list.module')->setFilename('system', 'core/modules/system/system.info.yml'); + \Drupal::service('extension.list.module')->setPathname('system', 'core/modules/system/system.info.yml'); // Install base system configuration. \Drupal::service('config.installer')->installDefaultConfig('core', 'core');