summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorNeil Drumm <drumm@3064.no-reply.drupal.org>2006-07-04 08:59:05 +0000
committerNeil Drumm <drumm@3064.no-reply.drupal.org>2006-07-04 08:59:05 +0000
commit59aa2ae8e8a7e29e0029941b28bce5b7ba31ae94 (patch)
tree53b2f31898c20a168d742111ae210aa19393dbbd /includes
parentc21db64ae8f965f28342b6cf528d180a057c6412 (diff)
downloadbrdo-59aa2ae8e8a7e29e0029941b28bce5b7ba31ae94.tar.gz
brdo-59aa2ae8e8a7e29e0029941b28bce5b7ba31ae94.tar.bz2
#71925 by Steven, remove # prefix from link array keys.
Diffstat (limited to 'includes')
-rw-r--r--includes/theme.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/includes/theme.inc b/includes/theme.inc
index d26bb80fa..53bd126bf 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>';
}
}
}