diff --git a/includes/ajax.inc b/includes/ajax.inc index 1fe3dbbc38bda1a10682a4c692236c33298c2b11..a23f2b3180af22ef7aa0280d4835494a790f99de 100644 --- a/includes/ajax.inc +++ b/includes/ajax.inc @@ -202,7 +202,7 @@ function views_ajax_command_replace_title($title) { $command = array( 'command' => 'viewsReplaceTitle', 'title' => $title, - 'siteName' => variable_get('site_name', 'Drupal'), + 'siteName' => config('system.site')->get('name'), ); return $command; } diff --git a/lib/Drupal/views/View.php b/lib/Drupal/views/View.php index 7456a663b2435fb93323dce81e5ca1d9bf459d6a..20de4b341176a0c3eeaf7c881e95b70b2714ffbc 100644 --- a/lib/Drupal/views/View.php +++ b/lib/Drupal/views/View.php @@ -1685,7 +1685,7 @@ function get_breadcrumb($set = FALSE) { foreach ($this->build_info['breadcrumb'] as $path => $title) { // Check to see if the frontpage is in the breadcrumb trail; if it // is, we'll remove that from the actual breadcrumb later. - if ($path == variable_get('site_frontpage', 'user')) { + if ($path == config('system.site')->get('page.front')) { $base = FALSE; $title = t('Home'); } diff --git a/modules/comment/views_plugin_row_comment_rss.inc b/modules/comment/views_plugin_row_comment_rss.inc index 87518284a08c49b7648f0261a823546d4fb20305..69c4cb450e434920b5277fd209c07508674f976c 100644 --- a/modules/comment/views_plugin_row_comment_rss.inc +++ b/modules/comment/views_plugin_row_comment_rss.inc @@ -86,7 +86,7 @@ function render($row) { $item_length = $this->options['item_length']; if ($item_length == 'default') { - $item_length = variable_get('feed_item_length', 'teaser'); + $item_length = config('system.rss')->get('items.view_mode'); } // Load the specified comment and its associated node: diff --git a/modules/node/views_plugin_row_node_rss.inc b/modules/node/views_plugin_row_node_rss.inc index 63c951bcd99e84e535e6112ff962e2d53b86d60c..b0161c5c834191fcb2436c1d76ff9b6105292a82 100644 --- a/modules/node/views_plugin_row_node_rss.inc +++ b/modules/node/views_plugin_row_node_rss.inc @@ -96,7 +96,7 @@ function render($row) { $display_mode = $this->options['item_length']; if ($display_mode == 'default') { - $display_mode = variable_get('feed_item_length', 'teaser'); + $display_mode = config('system.rss')->get('items.view_mode'); } // Load the specified node: diff --git a/modules/search/views_handler_filter_search.inc b/modules/search/views_handler_filter_search.inc index 6f0f87cc9b69f5a95ad5069a53260400cd48b9b8..d9292eba42b442d51ffe854a7435701e6d324254 100644 --- a/modules/search/views_handler_filter_search.inc +++ b/modules/search/views_handler_filter_search.inc @@ -76,7 +76,7 @@ function exposed_validate(&$form, &$form_state) { if (!empty($form_state['values'][$key])) { $this->query_parse_search_expression($form_state['values'][$key]); if (count($this->search_query->words()) == 0) { - form_set_error($key, format_plural(variable_get('minimum_word_size', 3), 'You must include at least one positive keyword with 1 character or more.', 'You must include at least one positive keyword with @count characters or more.')); + form_set_error($key, format_plural(config('search.settings')->get('index.minimum_word_size'), 'You must include at least one positive keyword with 1 character or more.', 'You must include at least one positive keyword with @count characters or more.')); } } } diff --git a/theme/theme.inc b/theme/theme.inc index a77cd2b80a6284737f68cf2701bd2aaab584f111..8c9a62f12358b5136380444461ed56202e9026d2 100644 --- a/theme/theme.inc +++ b/theme/theme.inc @@ -846,14 +846,16 @@ function template_preprocess_views_view_rss(&$vars) { $style = &$view->style_plugin; + $config = config('system.site'); + // The RSS 2.0 "spec" doesn't indicate HTML can be used in the description. // We strip all HTML tags, but need to prevent double encoding from properly // escaped source data (such as & becoming &). $vars['description'] = check_plain(decode_entities(strip_tags($style->get_description()))); if ($view->display_handler->get_option('sitename_title')) { - $title = variable_get('site_name', 'Drupal'); - if ($slogan = variable_get('site_slogan', '')) { + $title = $config->get('name'); + if ($slogan = $config->get('slogan')) { $title .= ' - ' . $slogan; } } @@ -877,7 +879,7 @@ function template_preprocess_views_view_rss(&$vars) { } // Compare the link to the default home page; if it's the default home page, just use $base_url. - if ($path == variable_get('site_frontpage', 'user')) { + if ($path == $config->get('page.front')) { $path = ''; }