From e5079a4276aa32b73f4e81e05480d3a1eb3c2d6f Mon Sep 17 00:00:00 2001
From: Tim Plunkett <git@plnktt.com>
Date: Thu, 9 Aug 2012 20:44:42 -0400
Subject: [PATCH] Issue #1717686 by tim.plunkett: language_manager() was
renamed language().
---
includes/cache.inc | 4 ++--
plugins/views_plugin_cache.inc | 4 ++--
plugins/views_plugin_localization_core.inc | 2 +-
theme/theme.inc | 2 +-
views.api.php | 2 +-
views.module | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/includes/cache.inc b/includes/cache.inc
index 2bb6493ef2e6..d4ec484f5326 100644
--- a/includes/cache.inc
+++ b/includes/cache.inc
@@ -132,7 +132,7 @@ function views_cache_set($cid, $data, $use_language = FALSE) {
return;
}
if ($use_language) {
- $cid .= ':' . language_manager(LANGUAGE_TYPE_INTERFACE)->langcode;
+ $cid .= ':' . language(LANGUAGE_TYPE_INTERFACE)->langcode;
}
cache('cache_views')->set($cid, $data);
@@ -156,7 +156,7 @@ function views_cache_get($cid, $use_language = FALSE) {
return FALSE;
}
if ($use_language) {
- $cid .= ':' . language_manager(LANGUAGE_TYPE_INTERFACE)->langcode;
+ $cid .= ':' . language(LANGUAGE_TYPE_INTERFACE)->langcode;
}
return cache('cache_views')->get($cid);
diff --git a/plugins/views_plugin_cache.inc b/plugins/views_plugin_cache.inc
index 01c4fec215e8..b176d8028314 100644
--- a/plugins/views_plugin_cache.inc
+++ b/plugins/views_plugin_cache.inc
@@ -283,7 +283,7 @@ function get_results_key() {
'build_info' => $build_info,
'roles' => array_keys($user->roles),
'super-user' => $user->uid == 1, // special caching for super user.
- 'language' => language_manager(LANGUAGE_TYPE_INTERFACE)->langcode,
+ 'language' => language(LANGUAGE_TYPE_INTERFACE)->langcode,
'base_url' => $GLOBALS['base_url'],
);
foreach (array('exposed_info', 'page', 'sort', 'order', 'items_per_page', 'offset') as $key) {
@@ -306,7 +306,7 @@ function get_output_key() {
'roles' => array_keys($user->roles),
'super-user' => $user->uid == 1, // special caching for super user.
'theme' => $GLOBALS['theme'],
- 'language' => language_manager(LANGUAGE_TYPE_INTERFACE)->langcode,
+ 'language' => language(LANGUAGE_TYPE_INTERFACE)->langcode,
'base_url' => $GLOBALS['base_url'],
);
diff --git a/plugins/views_plugin_localization_core.inc b/plugins/views_plugin_localization_core.inc
index 73bddd31f548..7db435319ee6 100644
--- a/plugins/views_plugin_localization_core.inc
+++ b/plugins/views_plugin_localization_core.inc
@@ -39,7 +39,7 @@ function translate_string($string, $keys = array(), $format = '') {
* The input format of the string. This is optional.
*/
function save_string($string, $keys = array(), $format = '') {
- $language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
+ $language_interface = language(LANGUAGE_TYPE_INTERFACE);
// If the current language is 'en', we need to reset the language
// in order to trigger an update.
diff --git a/theme/theme.inc b/theme/theme.inc
index 8c9a62f12358..e781683fb0ff 100644
--- a/theme/theme.inc
+++ b/theme/theme.inc
@@ -886,7 +886,7 @@ function template_preprocess_views_view_rss(&$vars) {
$vars['link'] = check_url(url($path, $url_options));
}
- $vars['langcode'] = check_plain(language_manager(LANGUAGE_TYPE_INTERFACE)->langcode);
+ $vars['langcode'] = check_plain(language(LANGUAGE_TYPE_INTERFACE)->langcode);
$vars['namespaces'] = drupal_attributes($style->namespaces);
$vars['items'] = $items;
$vars['channel_elements'] = format_xml_elements($style->channel_elements);
diff --git a/views.api.php b/views.api.php
index 5319cd6fc7a9..567b8ebcf82b 100644
--- a/views.api.php
+++ b/views.api.php
@@ -790,7 +790,7 @@ function hook_views_query_substitutions($view) {
return array(
'***CURRENT_VERSION***' => VERSION,
'***CURRENT_TIME***' => REQUEST_TIME,
- '***CURRENT_LANGUAGE***' => language_manager(LANGUAGE_TYPE_CONTENT)->langcode,
+ '***CURRENT_LANGUAGE***' => language(LANGUAGE_TYPE_CONTENT)->langcode,
'***DEFAULT_LANGUAGE***' => language_default()->langcode,
);
}
diff --git a/views.module b/views.module
index 171c3821c688..52fde865d313 100644
--- a/views.module
+++ b/views.module
@@ -2115,7 +2115,7 @@ function views_views_query_substitutions($view) {
return array(
'***CURRENT_VERSION***' => VERSION,
'***CURRENT_TIME***' => REQUEST_TIME,
- '***CURRENT_LANGUAGE***' => language_manager(LANGUAGE_TYPE_CONTENT)->langcode,
+ '***CURRENT_LANGUAGE***' => language(LANGUAGE_TYPE_CONTENT)->langcode,
'***DEFAULT_LANGUAGE***' => language_default()->langcode,
);
}
--
GitLab