diff --git a/core/includes/theme.inc b/core/includes/theme.inc index c89b734..fc963f4 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1348,7 +1348,7 @@ function template_preprocess_html(&$variables) { // etc.) as well as more specific data like path-frontpage. $path = \Drupal::request()->getPathInfo(); - if (drupal_is_front_page()) { + if (\Drupal::service('path.matcher')->isFrontPage()) { $variables['attributes']['class'][] = 'path-frontpage'; } else { @@ -1366,7 +1366,7 @@ function template_preprocess_html(&$variables) { } // @todo Remove once views is not bypassing the view subscriber anymore. // @see http://drupal.org/node/2068471 - elseif (drupal_is_front_page()) { + elseif (\Drupal::service('path.matcher')->isFrontPage()) { $head_title = array( 'title' => t('Home'), 'name' => String::checkPlain($site_config->get('name')), @@ -1545,7 +1545,7 @@ function theme_get_suggestions($args, $base, $delimiter = '__') { $prefix .= $delimiter . $arg; } } - if (drupal_is_front_page()) { + if (\Drupal::service('path.matcher')->isFrontPage()) { // Front templates should be based on root only, not prefixed arguments. $suggestions[] = $base . $delimiter . 'front'; } diff --git a/core/modules/language/src/Plugin/Block/LanguageBlock.php b/core/modules/language/src/Plugin/Block/LanguageBlock.php index 0502d2d..1bfe1e8 100644 --- a/core/modules/language/src/Plugin/Block/LanguageBlock.php +++ b/core/modules/language/src/Plugin/Block/LanguageBlock.php @@ -76,7 +76,7 @@ protected function blockAccess(AccountInterface $account) { */ public function build() { $build = array(); - $route_name = drupal_is_front_page() ? '' : ''; + $route_name = \Drupal::service('path.matcher')->isFrontPage() ? '' : ''; $type = $this->getDerivativeId(); $links = $this->languageManager->getLanguageSwitchLinks($type, Url::fromRoute($route_name)); diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 8f2a8ab..fd04dfe 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -266,7 +266,7 @@ function system_theme_suggestions_maintenance_page(array $variables) { // allow themers to override the page and the content completely. $offline = defined('MAINTENANCE_MODE'); try { - drupal_is_front_page(); + \Drupal::service('path.matcher')->isFrontPage(); } catch (Exception $e) { // The database is not yet available. @@ -608,7 +608,7 @@ function system_page_attachments(array &$page) { // Collect the current state that determines whether a link is active. array( 'path' => \Drupal::routeMatch()->getRouteName() ? Url::fromRouteMatch(\Drupal::routeMatch())->getInternalPath() : '', - 'front' => drupal_is_front_page(), + 'front' => \Drupal::service('path.matcher')->isFrontPage(), 'language' => \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_URL)->getId(), 'query' => \Drupal::request()->query->all(), ) @@ -640,7 +640,7 @@ function system_js_settings_alter(&$settings) { 'pathPrefix' => $pathPrefix, 'currentPath' => $current_path, 'currentPathIsAdmin' => $current_path_is_admin, - 'isFront' => drupal_is_front_page(), + 'isFront' => \Drupal::service('path.matcher')->isFrontPage(), 'currentLanguage' => \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_URL)->getId(), ]; if (!empty($current_query)) { diff --git a/core/modules/system/tests/modules/system_test/system_test.module b/core/modules/system/tests/modules/system_test/system_test.module index b44e0a0..d03725b 100644 --- a/core/modules/system/tests/modules/system_test/system_test.module +++ b/core/modules/system/tests/modules/system_test/system_test.module @@ -101,7 +101,7 @@ function system_test_lock_exit() { function system_test_page_attachments(array &$page) { // Used by FrontPageTestCase to get the results of drupal_is_front_page(). $frontpage = \Drupal::state()->get('system_test.front_page_output') ?: 0; - if ($frontpage && drupal_is_front_page()) { + if ($frontpage && \Drupal::service('path.matcher')->isFrontPage()) { drupal_set_message(t('On front page.')); } }