summaryrefslogtreecommitdiff
path: root/modules/field
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-03-07 07:44:18 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-03-07 07:44:18 +0000
commit3205a26755ecf71b4d8503359c2ff1910254f322 (patch)
tree347bdfc3befa2879e8a62b6eed205dc911b9259c /modules/field
parenta2232c40eed8afee0a9b38b587e4895cc11c26da (diff)
downloadbrdo-3205a26755ecf71b4d8503359c2ff1910254f322.tar.gz
brdo-3205a26755ecf71b4d8503359c2ff1910254f322.tar.bz2
#282191 follow-up by plach: Remove ambitious parts of translatable fields UI from core that are no longer relevant, given what made it into Drupal 7.
Diffstat (limited to 'modules/field')
-rw-r--r--modules/field/field.multilingual.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/field/field.multilingual.inc b/modules/field/field.multilingual.inc
index f976bbe44..11e89b29b 100644
--- a/modules/field/field.multilingual.inc
+++ b/modules/field/field.multilingual.inc
@@ -132,8 +132,8 @@ function field_multilingual_valid_language($langcode, $default = TRUE) {
if (in_array($langcode, $enabled_languages)) {
return $langcode;
}
- global $language;
- $langcode = $default ? language_default('language') : $language->language;
+ global $language_content;
+ $langcode = $default ? language_default('language') : $language_content->language;
if (in_array($langcode, $enabled_languages)) {
return $langcode;
}