From 5bb6927e18d4496395dea37cc5b14bb15cb42cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= Date: Wed, 5 Dec 2007 16:34:07 +0000 Subject: #196410 report by daniel.soneira, patch by myself, tested by Freso: several fixes to url() generation and path aliasing, fixing path aliases for node paths and front page links in themes --- modules/node/node.admin.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'modules/node') diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc index f4b7e85aa..d665233c5 100644 --- a/modules/node/node.admin.inc +++ b/modules/node/node.admin.inc @@ -380,16 +380,18 @@ function node_admin_nodes() { '#submit' => array('node_admin_nodes_submit'), ); + $languages = language_list(); $destination = drupal_get_destination(); $nodes = array(); while ($node = db_fetch_object($result)) { $nodes[$node->nid] = ''; - $form['title'][$node->nid] = array('#value' => l($node->title, 'node/'. $node->nid) .' '. theme('mark', node_mark($node->nid, $node->changed))); + $options = empty($node->language) ? array() : array('language' => $languages[$node->language]); + $form['title'][$node->nid] = array('#value' => l($node->title, 'node/'. $node->nid, $options) .' '. theme('mark', node_mark($node->nid, $node->changed))); $form['name'][$node->nid] = array('#value' => check_plain(node_get_types('name', $node))); $form['username'][$node->nid] = array('#value' => theme('username', $node)); $form['status'][$node->nid] = array('#value' => ($node->status ? t('published') : t('not published'))); if ($multilanguage) { - $form['language'][$node->nid] = array('#value' => empty($node->language) ? t('Language neutral') : module_invoke('locale', 'language_name', $node->language)); + $form['language'][$node->nid] = array('#value' => empty($node->language) ? t('Language neutral') : t($languages[$node->language]->name)); } $form['operations'][$node->nid] = array('#value' => l(t('edit'), 'node/'. $node->nid .'/edit', array('query' => $destination))); } -- cgit v1.2.3