diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 873bb1f..dd86182 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -654,14 +654,17 @@ function node_field_extra_fields() { // Add also the 'language' select if Language module is enabled and the // bundle has multilingual support. - // Visibility of the ordering of the language selector is the same as on the node/add form, - // i.e. node_type_language_hidden_TYPE variable - if ($module_language_enabled && !variable_get('node_type_language_hidden_' . $bundle->type, TRUE)) { - $extra['node'][$bundle->type]['form']['language'] = array( - 'label' => t('Language'), - 'description' => $description, - 'weight' => 0, - ); + // Visibility of the ordering of the language selector is the same as on the + // node/add form. + if ($module_language_enabled) { + $configuration = language_get_default_configuration('node', $bundle->type); + if (!$configuration['language_hidden']) { + $extra['node'][$bundle->type]['form']['language'] = array( + 'label' => t('Language'), + 'description' => $description, + 'weight' => 0, + ); + } } }