From 59aa2ae8e8a7e29e0029941b28bce5b7ba31ae94 Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Tue, 4 Jul 2006 08:59:05 +0000
Subject: [PATCH] #71925 by Steven, remove # prefix from link array keys.
---
includes/theme.inc | 16 ++++----
modules/aggregator.module | 8 ++--
modules/aggregator/aggregator.module | 8 ++--
modules/blog.module | 6 +--
modules/blog/blog.module | 6 +--
modules/book.module | 10 ++---
modules/book/book.module | 10 ++---
modules/comment.module | 58 ++++++++++++++--------------
modules/comment/comment.module | 58 ++++++++++++++--------------
modules/forum.module | 6 +--
modules/forum/forum.module | 6 +--
modules/node.module | 6 +--
modules/node/node.module | 6 +--
modules/poll.module | 4 +-
modules/poll/poll.module | 4 +-
modules/statistics.module | 2 +-
modules/statistics/statistics.module | 2 +-
modules/taxonomy.module | 6 +--
modules/taxonomy/taxonomy.module | 6 +--
modules/upload.module | 8 ++--
modules/upload/upload.module | 8 ++--
21 files changed, 122 insertions(+), 122 deletions(-)
diff --git a/includes/theme.inc b/includes/theme.inc
index d26bb80fa0cf..53bd126bf156 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -497,20 +497,20 @@ function theme_links($links, $delimiter = ' | ') {
if (is_array($links)) {
foreach ($links as $key => $link) {
- //Automatically add a class to each link and convert all _ to - for XHTML compliance
- if (isset($link['#attributes']) && isset($link['#attributes']['class'])) {
- $link['#attributes']['class'] .= ' '. str_replace('_', '-', $key);
+ // Automatically add a class to each link and convert all _ to - for XHTML compliance
+ if (isset($link['attributes']) && isset($link['attributes']['class'])) {
+ $link['attributes']['class'] .= ' '. str_replace('_', '-', $key);
}
else {
- $link['#attributes']['class'] = str_replace('_', '-', $key);
+ $link['attributes']['class'] = str_replace('_', '-', $key);
}
- if ($link['#href']) {
- $output[] = l($link['#title'], $link['#href'], $link['#attributes'], $link['#query'], $link['#fragment']);
+ if ($link['href']) {
+ $output[] = l($link['title'], $link['href'], $link['attributes'], $link['query'], $link['fragment']);
}
- else if ($link['#title']) {
+ else if ($link['title']) {
//Some links are actually not links, but we wrap these in <span> for adding title and class attributes
- $output[] = '<span'. drupal_attributes($link['#attributes']) .'>'. $link['#title'] .'</span>';
+ $output[] = '<span'. drupal_attributes($link['attributes']) .'>'. check_plain($link['title']) .'</span>';
}
}
}
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 3af1bd661cf2..74e1386619f0 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -1151,8 +1151,8 @@ function aggregator_page_sources() {
$output .= theme('item_list', $list);
$link['sources'] = array(
- '#title' => t('more'),
- '#href' => 'aggregator/sources/'. $feed->fid
+ 'title' => t('more'),
+ 'href' => 'aggregator/sources/'. $feed->fid
);
$output .= '<div class="links">'. theme('links', $link) ."</div>\n";
@@ -1255,8 +1255,8 @@ function aggregator_page_categories() {
}
$link['categories'] = array(
- '#title' => t('more'),
- '#href' => 'aggregator/categories/'. $category->cid
+ 'title' => t('more'),
+ 'href' => 'aggregator/categories/'. $category->cid
);
$output .= '<div class="links">'. theme('links', $link) ."</div>\n";
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 3af1bd661cf2..74e1386619f0 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -1151,8 +1151,8 @@ function aggregator_page_sources() {
$output .= theme('item_list', $list);
$link['sources'] = array(
- '#title' => t('more'),
- '#href' => 'aggregator/sources/'. $feed->fid
+ 'title' => t('more'),
+ 'href' => 'aggregator/sources/'. $feed->fid
);
$output .= '<div class="links">'. theme('links', $link) ."</div>\n";
@@ -1255,8 +1255,8 @@ function aggregator_page_categories() {
}
$link['categories'] = array(
- '#title' => t('more'),
- '#href' => 'aggregator/categories/'. $category->cid
+ 'title' => t('more'),
+ 'href' => 'aggregator/categories/'. $category->cid
);
$output .= '<div class="links">'. theme('links', $link) ."</div>\n";
diff --git a/modules/blog.module b/modules/blog.module
index 01c5fa557ab6..13da3d34fa8b 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -250,9 +250,9 @@ function blog_link($type, $node = 0, $main = 0) {
if ($type == 'node' && $node->type == 'blog') {
if (arg(0) != 'blog' || arg(1) != $node->uid) {
$links['blog_usernames_blog'] = array(
- '#title' => t("%username's blog", array('%username' => $node->name)),
- '#href' => "blog/$node->uid",
- '#attributes' => array('title' => t("Read %username's latest blog entries.", array('%username' => $node->name)))
+ 'title' => t("%username's blog", array('%username' => $node->name)),
+ 'href' => "blog/$node->uid",
+ 'attributes' => array('title' => t("Read %username's latest blog entries.", array('%username' => $node->name)))
);
}
}
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 01c5fa557ab6..13da3d34fa8b 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -250,9 +250,9 @@ function blog_link($type, $node = 0, $main = 0) {
if ($type == 'node' && $node->type == 'blog') {
if (arg(0) != 'blog' || arg(1) != $node->uid) {
$links['blog_usernames_blog'] = array(
- '#title' => t("%username's blog", array('%username' => $node->name)),
- '#href' => "blog/$node->uid",
- '#attributes' => array('title' => t("Read %username's latest blog entries.", array('%username' => $node->name)))
+ 'title' => t("%username's blog", array('%username' => $node->name)),
+ 'href' => "blog/$node->uid",
+ 'attributes' => array('title' => t("Read %username's latest blog entries.", array('%username' => $node->name)))
);
}
}
diff --git a/modules/book.module b/modules/book.module
index 5d58ad5d5681..c7f18d8727c4 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -59,15 +59,15 @@ function book_link($type, $node = 0, $main = 0) {
if (!$main) {
if (book_access('create', $node)) {
$links['book_add_child'] = array(
- '#title' => t('add child page'),
- '#href' => "node/add/book/parent/$node->nid"
+ 'title' => t('add child page'),
+ 'href' => "node/add/book/parent/$node->nid"
);
}
if (user_access('see printer-friendly version')) {
$links['book_printer'] = array(
- '#title' => t('printer-friendly version'),
- '#href' => 'book/export/html/'. $node->nid,
- '#attributes' => array('title' => t('Show a printer-friendly version of this book page and its sub-pages.'))
+ 'title' => t('printer-friendly version'),
+ 'href' => 'book/export/html/'. $node->nid,
+ 'attributes' => array('title' => t('Show a printer-friendly version of this book page and its sub-pages.'))
);
}
}
diff --git a/modules/book/book.module b/modules/book/book.module
index 5d58ad5d5681..c7f18d8727c4 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -59,15 +59,15 @@ function book_link($type, $node = 0, $main = 0) {
if (!$main) {
if (book_access('create', $node)) {
$links['book_add_child'] = array(
- '#title' => t('add child page'),
- '#href' => "node/add/book/parent/$node->nid"
+ 'title' => t('add child page'),
+ 'href' => "node/add/book/parent/$node->nid"
);
}
if (user_access('see printer-friendly version')) {
$links['book_printer'] = array(
- '#title' => t('printer-friendly version'),
- '#href' => 'book/export/html/'. $node->nid,
- '#attributes' => array('title' => t('Show a printer-friendly version of this book page and its sub-pages.'))
+ 'title' => t('printer-friendly version'),
+ 'href' => 'book/export/html/'. $node->nid,
+ 'attributes' => array('title' => t('Show a printer-friendly version of this book page and its sub-pages.'))
);
}
}
diff --git a/modules/comment.module b/modules/comment.module
index 46dce36ba4d8..0d40b2d9cc19 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -196,18 +196,18 @@ function comment_link($type, $node = 0, $main = 0) {
if ($all) {
$links['comment_comments'] = array(
- '#title' => format_plural($all, '1 comment', '%count comments'),
- '#href' => "node/$node->nid",
- '#attributes' => array('title' => t('Jump to the first comment of this posting.')),
- '#fragment' => 'comment'
+ 'title' => format_plural($all, '1 comment', '%count comments'),
+ 'href' => "node/$node->nid",
+ 'attributes' => array('title' => t('Jump to the first comment of this posting.')),
+ 'fragment' => 'comment'
);
if ($new) {
$links['comment_new_comments'] = array(
- '#title' => format_plural($new, '1 new comment', '%count new comments'),
- '#href' => "node/$node->nid",
- '#attributes' => array('title' => t('Jump to the first new comment of this posting.')),
- '#fragment' => 'new'
+ 'title' => format_plural($new, '1 new comment', '%count new comments'),
+ 'href' => "node/$node->nid",
+ 'attributes' => array('title' => t('Jump to the first new comment of this posting.')),
+ 'fragment' => 'new'
);
}
}
@@ -215,10 +215,10 @@ function comment_link($type, $node = 0, $main = 0) {
if ($node->comment == COMMENT_NODE_READ_WRITE) {
if (user_access('post comments')) {
$links['comment_add'] = array(
- '#title' => t('add new comment'),
- '#href' => "comment/reply/$node->nid",
- '#attributes' => array('title' => t('Add a new comment to this page.')),
- '#fragment' => 'comment_form'
+ 'title' => t('add new comment'),
+ 'href' => "comment/reply/$node->nid",
+ 'attributes' => array('title' => t('Add a new comment to this page.')),
+ 'fragment' => 'comment_form'
);
}
else {
@@ -236,10 +236,10 @@ function comment_link($type, $node = 0, $main = 0) {
if (user_access('post comments')) {
if (variable_get('comment_form_location', COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) {
$links['comment_add'] = array(
- '#title' => t('add new comment'),
- '#href' => "comment/reply/$node->nid",
- '#attributes' => array('title' => t('Share your thoughts and opinions related to this posting.')),
- '#fragment' => 'comment_form'
+ 'title' => t('add new comment'),
+ 'href' => "comment/reply/$node->nid",
+ 'attributes' => array('title' => t('Share your thoughts and opinions related to this posting.')),
+ 'fragment' => 'comment_form'
);
}
}
@@ -689,37 +689,37 @@ function comment_links($comment, $return = 1) {
// If we are viewing just this comment, we link back to the node.
if ($return) {
$links['comment_parent'] = array(
- '#title' => t('parent'),
- '#href' => comment_node_url(),
- '#fragment' => "comment-$comment->cid"
+ 'title' => t('parent'),
+ 'href' => comment_node_url(),
+ 'fragment' => "comment-$comment->cid"
);
}
if (node_comment_mode($comment->nid) == COMMENT_NODE_READ_WRITE) {
if (user_access('administer comments') && user_access('post comments')) {
$links['comment_delete'] = array(
- '#title' => t('delete'),
- '#href' => "comment/delete/$comment->cid"
+ 'title' => t('delete'),
+ 'href' => "comment/delete/$comment->cid"
);
$links['comment_edit'] = array(
- '#title' => t('edit'),
- '#href' => "comment/edit/$comment->cid"
+ 'title' => t('edit'),
+ 'href' => "comment/edit/$comment->cid"
);
$links['comment_reply'] = array(
- '#title' => t('reply'),
- '#href' => "comment/reply/$comment->nid/$comment->cid"
+ 'title' => t('reply'),
+ 'href' => "comment/reply/$comment->nid/$comment->cid"
);
}
else if (user_access('post comments')) {
if (comment_access('edit', $comment)) {
$links['comment_edit'] = array(
- '#title' => t('edit'),
- '#href' => "comment/edit/$comment->cid"
+ 'title' => t('edit'),
+ 'href' => "comment/edit/$comment->cid"
);
}
$links['comment_reply'] = array(
- '#title' => t('reply'),
- '#href' => "comment/reply/$comment->nid/$comment->cid"
+ 'title' => t('reply'),
+ 'href' => "comment/reply/$comment->nid/$comment->cid"
);
}
else {
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 46dce36ba4d8..0d40b2d9cc19 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -196,18 +196,18 @@ function comment_link($type, $node = 0, $main = 0) {
if ($all) {
$links['comment_comments'] = array(
- '#title' => format_plural($all, '1 comment', '%count comments'),
- '#href' => "node/$node->nid",
- '#attributes' => array('title' => t('Jump to the first comment of this posting.')),
- '#fragment' => 'comment'
+ 'title' => format_plural($all, '1 comment', '%count comments'),
+ 'href' => "node/$node->nid",
+ 'attributes' => array('title' => t('Jump to the first comment of this posting.')),
+ 'fragment' => 'comment'
);
if ($new) {
$links['comment_new_comments'] = array(
- '#title' => format_plural($new, '1 new comment', '%count new comments'),
- '#href' => "node/$node->nid",
- '#attributes' => array('title' => t('Jump to the first new comment of this posting.')),
- '#fragment' => 'new'
+ 'title' => format_plural($new, '1 new comment', '%count new comments'),
+ 'href' => "node/$node->nid",
+ 'attributes' => array('title' => t('Jump to the first new comment of this posting.')),
+ 'fragment' => 'new'
);
}
}
@@ -215,10 +215,10 @@ function comment_link($type, $node = 0, $main = 0) {
if ($node->comment == COMMENT_NODE_READ_WRITE) {
if (user_access('post comments')) {
$links['comment_add'] = array(
- '#title' => t('add new comment'),
- '#href' => "comment/reply/$node->nid",
- '#attributes' => array('title' => t('Add a new comment to this page.')),
- '#fragment' => 'comment_form'
+ 'title' => t('add new comment'),
+ 'href' => "comment/reply/$node->nid",
+ 'attributes' => array('title' => t('Add a new comment to this page.')),
+ 'fragment' => 'comment_form'
);
}
else {
@@ -236,10 +236,10 @@ function comment_link($type, $node = 0, $main = 0) {
if (user_access('post comments')) {
if (variable_get('comment_form_location', COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) {
$links['comment_add'] = array(
- '#title' => t('add new comment'),
- '#href' => "comment/reply/$node->nid",
- '#attributes' => array('title' => t('Share your thoughts and opinions related to this posting.')),
- '#fragment' => 'comment_form'
+ 'title' => t('add new comment'),
+ 'href' => "comment/reply/$node->nid",
+ 'attributes' => array('title' => t('Share your thoughts and opinions related to this posting.')),
+ 'fragment' => 'comment_form'
);
}
}
@@ -689,37 +689,37 @@ function comment_links($comment, $return = 1) {
// If we are viewing just this comment, we link back to the node.
if ($return) {
$links['comment_parent'] = array(
- '#title' => t('parent'),
- '#href' => comment_node_url(),
- '#fragment' => "comment-$comment->cid"
+ 'title' => t('parent'),
+ 'href' => comment_node_url(),
+ 'fragment' => "comment-$comment->cid"
);
}
if (node_comment_mode($comment->nid) == COMMENT_NODE_READ_WRITE) {
if (user_access('administer comments') && user_access('post comments')) {
$links['comment_delete'] = array(
- '#title' => t('delete'),
- '#href' => "comment/delete/$comment->cid"
+ 'title' => t('delete'),
+ 'href' => "comment/delete/$comment->cid"
);
$links['comment_edit'] = array(
- '#title' => t('edit'),
- '#href' => "comment/edit/$comment->cid"
+ 'title' => t('edit'),
+ 'href' => "comment/edit/$comment->cid"
);
$links['comment_reply'] = array(
- '#title' => t('reply'),
- '#href' => "comment/reply/$comment->nid/$comment->cid"
+ 'title' => t('reply'),
+ 'href' => "comment/reply/$comment->nid/$comment->cid"
);
}
else if (user_access('post comments')) {
if (comment_access('edit', $comment)) {
$links['comment_edit'] = array(
- '#title' => t('edit'),
- '#href' => "comment/edit/$comment->cid"
+ 'title' => t('edit'),
+ 'href' => "comment/edit/$comment->cid"
);
}
$links['comment_reply'] = array(
- '#title' => t('reply'),
- '#href' => "comment/reply/$comment->nid/$comment->cid"
+ 'title' => t('reply'),
+ 'href' => "comment/reply/$comment->nid/$comment->cid"
);
}
else {
diff --git a/modules/forum.module b/modules/forum.module
index d305b914c9fe..4ba752d73440 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -636,14 +636,14 @@ function _forum_parent_select($tid, $title, $child_type) {
}
function forum_link_alter(&$node, &$links) {
- foreach ($links AS $module => $link) {
+ foreach ($links as $module => $link) {
if (strstr($module, 'taxonomy_term')) {
// Link back to the forum and not the taxonomy term page. We'll only
// do this if the taxonomy term in question belongs to forums.
- $tid = str_replace('taxonomy/term/', '', $link['#href']);
+ $tid = str_replace('taxonomy/term/', '', $link['href']);
$term = taxonomy_get_term($tid);
if ($term->vid == _forum_get_vid()) {
- $links[$module]['#href'] = str_replace('taxonomy/term', 'forum', $link['#href']);
+ $links[$module]['href'] = str_replace('taxonomy/term', 'forum', $link['href']);
}
}
}
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index d305b914c9fe..4ba752d73440 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -636,14 +636,14 @@ function _forum_parent_select($tid, $title, $child_type) {
}
function forum_link_alter(&$node, &$links) {
- foreach ($links AS $module => $link) {
+ foreach ($links as $module => $link) {
if (strstr($module, 'taxonomy_term')) {
// Link back to the forum and not the taxonomy term page. We'll only
// do this if the taxonomy term in question belongs to forums.
- $tid = str_replace('taxonomy/term/', '', $link['#href']);
+ $tid = str_replace('taxonomy/term/', '', $link['href']);
$term = taxonomy_get_term($tid);
if ($term->vid == _forum_get_vid()) {
- $links[$module]['#href'] = str_replace('taxonomy/term', 'forum', $link['#href']);
+ $links[$module]['href'] = str_replace('taxonomy/term', 'forum', $link['href']);
}
}
}
diff --git a/modules/node.module b/modules/node.module
index 573c1c31b5bd..129659abd7db 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -816,9 +816,9 @@ function node_link($type, $node = 0, $main = 0) {
if ($main == 1 && $node->teaser && $node->readmore) {
$links['node_read_more'] = array(
- '#title' => t('read more'),
- '#href' => "node/$node->nid",
- '#attributes' => array('title' => t('Read the rest of this posting.'))
+ 'title' => t('read more'),
+ 'href' => "node/$node->nid",
+ 'attributes' => array('title' => t('Read the rest of this posting.'))
);
}
}
diff --git a/modules/node/node.module b/modules/node/node.module
index 573c1c31b5bd..129659abd7db 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -816,9 +816,9 @@ function node_link($type, $node = 0, $main = 0) {
if ($main == 1 && $node->teaser && $node->readmore) {
$links['node_read_more'] = array(
- '#title' => t('read more'),
- '#href' => "node/$node->nid",
- '#attributes' => array('title' => t('Read the rest of this posting.'))
+ 'title' => t('read more'),
+ 'href' => "node/$node->nid",
+ 'attributes' => array('title' => t('Read the rest of this posting.'))
);
}
}
diff --git a/modules/poll.module b/modules/poll.module
index 0f587280f9dc..9247f2ed0864 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -544,9 +544,9 @@ function poll_view(&$node, $teaser = FALSE, $page = FALSE, $block = FALSE) {
$node->body = $node->teaser = '';
$links = module_invoke_all('link', 'node', $node, 1);
- $links[] = array('#title' => t('older polls'), '#href' => 'poll', '#attributes' => array('title' => t('View the list of polls on this site.')));
+ $links[] = array('title' => t('older polls'), 'href' => 'poll', 'attributes' => array('title' => t('View the list of polls on this site.')));
if ($node->allowvotes && $block) {
- $links[] = array('#title' => t('results'), '#href' => 'node/'. $node->nid .'/results', '#attributes' => array('title' => t('View the current poll results.')));
+ $links[] = array('title' => t('results'), 'href' => 'node/'. $node->nid .'/results', 'attributes' => array('title' => t('View the current poll results.')));
}
$node->links = $links;
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 0f587280f9dc..9247f2ed0864 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -544,9 +544,9 @@ function poll_view(&$node, $teaser = FALSE, $page = FALSE, $block = FALSE) {
$node->body = $node->teaser = '';
$links = module_invoke_all('link', 'node', $node, 1);
- $links[] = array('#title' => t('older polls'), '#href' => 'poll', '#attributes' => array('title' => t('View the list of polls on this site.')));
+ $links[] = array('title' => t('older polls'), 'href' => 'poll', 'attributes' => array('title' => t('View the list of polls on this site.')));
if ($node->allowvotes && $block) {
- $links[] = array('#title' => t('results'), '#href' => 'node/'. $node->nid .'/results', '#attributes' => array('title' => t('View the current poll results.')));
+ $links[] = array('title' => t('results'), 'href' => 'node/'. $node->nid .'/results', 'attributes' => array('title' => t('View the current poll results.')));
}
$node->links = $links;
diff --git a/modules/statistics.module b/modules/statistics.module
index 67dfa76453aa..522fb60ac70e 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -99,7 +99,7 @@ function statistics_link($type, $node = 0, $main = 0) {
if ($type != 'comment' && user_access('view post access counter')) {
$statistics = statistics_get($node->nid);
if ($statistics) {
- $links['statistics_counter']['#title'] = format_plural($statistics['totalcount'], '1 read', '%count reads');
+ $links['statistics_counter']['title'] = format_plural($statistics['totalcount'], '1 read', '%count reads');
}
}
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index 67dfa76453aa..522fb60ac70e 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -99,7 +99,7 @@ function statistics_link($type, $node = 0, $main = 0) {
if ($type != 'comment' && user_access('view post access counter')) {
$statistics = statistics_get($node->nid);
if ($statistics) {
- $links['statistics_counter']['#title'] = format_plural($statistics['totalcount'], '1 read', '%count reads');
+ $links['statistics_counter']['title'] = format_plural($statistics['totalcount'], '1 read', '%count reads');
}
}
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index ebcf4dd9c2df..23349c322a2f 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -30,9 +30,9 @@ function taxonomy_link($type, $node = NULL) {
if (array_key_exists('taxonomy', $node)) {
foreach ($node->taxonomy as $term) {
$links['taxonomy_term_'. $term->tid] = array(
- '#title' => $term->name,
- '#href' => taxonomy_term_path($term),
- '#attributes' => array('rel' => 'tag', 'title' => strip_tags($term->description))
+ 'title' => $term->name,
+ 'href' => taxonomy_term_path($term),
+ 'attributes' => array('rel' => 'tag', 'title' => strip_tags($term->description))
);
}
}
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index ebcf4dd9c2df..23349c322a2f 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -30,9 +30,9 @@ function taxonomy_link($type, $node = NULL) {
if (array_key_exists('taxonomy', $node)) {
foreach ($node->taxonomy as $term) {
$links['taxonomy_term_'. $term->tid] = array(
- '#title' => $term->name,
- '#href' => taxonomy_term_path($term),
- '#attributes' => array('rel' => 'tag', 'title' => strip_tags($term->description))
+ 'title' => $term->name,
+ 'href' => taxonomy_term_path($term),
+ 'attributes' => array('rel' => 'tag', 'title' => strip_tags($term->description))
);
}
}
diff --git a/modules/upload.module b/modules/upload.module
index f7c6be556868..78c1c47b9dc7 100644
--- a/modules/upload.module
+++ b/modules/upload.module
@@ -54,10 +54,10 @@ function upload_link($type, $node = 0, $main = 0) {
}
if ($num_files) {
$links['upload_attachments'] = array(
- '#title' => format_plural($num_files, '1 attachment', '%count attachments'),
- '#href' => "node/$node->nid",
- '#attributes' => array('title' => t('Read full article to view attachments.')),
- '#fragment' => 'attachments'
+ 'title' => format_plural($num_files, '1 attachment', '%count attachments'),
+ 'href' => "node/$node->nid",
+ 'attributes' => array('title' => t('Read full article to view attachments.')),
+ 'fragment' => 'attachments'
);
}
}
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index f7c6be556868..78c1c47b9dc7 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -54,10 +54,10 @@ function upload_link($type, $node = 0, $main = 0) {
}
if ($num_files) {
$links['upload_attachments'] = array(
- '#title' => format_plural($num_files, '1 attachment', '%count attachments'),
- '#href' => "node/$node->nid",
- '#attributes' => array('title' => t('Read full article to view attachments.')),
- '#fragment' => 'attachments'
+ 'title' => format_plural($num_files, '1 attachment', '%count attachments'),
+ 'href' => "node/$node->nid",
+ 'attributes' => array('title' => t('Read full article to view attachments.')),
+ 'fragment' => 'attachments'
);
}
}
--
GitLab