diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc index e197f60..9cb5672 100644 --- a/core/modules/node/node.admin.inc +++ b/core/modules/node/node.admin.inc @@ -104,8 +104,8 @@ function node_filters() { ) + node_type_get_names(), ); - // Language filter if the site is multilingual. - if (language_multilingual()) { + // Language filter if language support is present. + if (module_exists('language')) { $languages = language_list(TRUE); $language_options = array(LANGUAGE_NONE => t('- None -')); foreach ($languages as $langcode => $language) { @@ -433,9 +433,8 @@ function node_admin_nodes() { '#submit' => array('node_admin_nodes_submit'), ); - // Enable language column if translation module is enabled or if we have any - // node with language. - $multilanguage = (module_exists('translation') || db_query_range("SELECT 1 FROM {node} WHERE language <> :language", 0, 1, array(':language' => LANGUAGE_NONE))->fetchField()); + // Enable language column if language functionality is on. + $language_enabled = module_exists('language'); // Build the sortable table header. $header = array( @@ -445,7 +444,7 @@ function node_admin_nodes() { 'status' => array('data' => t('Status'), 'field' => 'n.status'), 'changed' => array('data' => t('Updated'), 'field' => 'n.changed', 'sort' => 'desc') ); - if ($multilanguage) { + if ($language_enabled) { $header['language_name'] = array('data' => t('Language'), 'field' => 'n.language'); } $header['operations'] = array('data' => t('Operations')); @@ -497,7 +496,7 @@ function node_admin_nodes() { 'status' => $node->status ? t('published') : t('not published'), 'changed' => format_date($node->changed, 'short'), ); - if ($multilanguage) { + if ($language_enabled) { $options[$node->nid]['language_name'] = language_name($node->language); } // Build a list of all the accessible operations for the current node.