Commit e5079a42 authored by tim.plunkett's avatar tim.plunkett

Issue #1717686 by tim.plunkett: language_manager() was renamed language().

parent 3865a7c8
......@@ -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);
......
......@@ -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'],
);
......
......@@ -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.
......
......@@ -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);
......
......@@ -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,
);
}
......
......@@ -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,
);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment