summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2016-01-30 17:02:13 -0500
committerDavid Rothstein <drothstein@gmail.com>2016-01-30 17:02:13 -0500
commit193adfa8e386928cfd1e5994c483ad399a7e45a7 (patch)
tree493e27b59324a55e0428c90b08442c7ca42dccf5
parent111d400ae9ef36cd2714cf07ea6cf155348ff050 (diff)
downloadbrdo-193adfa8e386928cfd1e5994c483ad399a7e45a7.tar.gz
brdo-193adfa8e386928cfd1e5994c483ad399a7e45a7.tar.bz2
Issue #2594585 by Xano, dcam: Use entity_uri() when linking to nodes on the admin/content page
-rw-r--r--modules/node/node.admin.inc9
1 files changed, 6 insertions, 3 deletions
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index 145be7ad9..eead4ea98 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -508,14 +508,17 @@ function node_admin_nodes() {
$options = array();
foreach ($nodes as $node) {
$langcode = entity_language('node', $node);
- $l_options = $langcode != LANGUAGE_NONE && isset($languages[$langcode]) ? array('language' => $languages[$langcode]) : array();
+ $uri = entity_uri('node', $node);
+ if ($langcode != LANGUAGE_NONE && isset($languages[$langcode])) {
+ $uri['options']['language'] = $languages[$langcode];
+ }
$options[$node->nid] = array(
'title' => array(
'data' => array(
'#type' => 'link',
'#title' => $node->title,
- '#href' => 'node/' . $node->nid,
- '#options' => $l_options,
+ '#href' => $uri['path'],
+ '#options' => $uri['options'],
'#suffix' => ' ' . theme('mark', array('type' => node_mark($node->nid, $node->changed))),
),
),