? Doxyfile ? index.html ? database/database.prefixed.mysql Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.258 diff -u -F^f -r1.258 theme.inc --- includes/theme.inc 8 Sep 2005 19:17:34 -0000 1.258 +++ includes/theme.inc 9 Oct 2005 09:56:44 -0000 @@ -500,13 +500,22 @@ function theme_status_messages() { * Return a themed set of links. * * @param $links - * An array of links to be themed. + * An keyed array of link objects. * @param $delimiter * A string used to separate the links. * @return * A string containing the themed links. */ function theme_links($links, $delimiter = ' | ') { + foreach ($links as $link) { + if ($link->link) { + $links[] = l($link->title, $link->link, $link->entities, $link->query, $link->fraction); + } + else { + //Some links are actually not links ... + $links[] = $link->title; + } + } return implode($delimiter, $links); } Index: modules/blog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blog.module,v retrieving revision 1.226 diff -u -F^f -r1.226 blog.module --- modules/blog.module 7 Sep 2005 20:17:18 -0000 1.226 +++ modules/blog.module 9 Oct 2005 09:56:44 -0000 @@ -238,7 +238,9 @@ function blog_link($type, $node = 0, $ma if ($type == 'node' && $node->type == 'blog') { if (arg(0) != 'blog' || arg(1) != $node->uid) { - $links[] = l(t("%username's blog", array('%username' => $node->name)), "blog/$node->uid", array('title' => t("Read %username's latest blog entries.", array('%username' => $node->name)))); + $links['blog_usersblog']->title = t("%username's blog", array('%username' => $node->name)); + $links['blog_usersblog']->link = "blog/$node->uid"; + $links['blog_usersblog']->entities = array('title' => t("Read %username's latest blog entries.", array('%username' => $node->name))); } } Index: modules/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book.module,v retrieving revision 1.315 diff -u -F^f -r1.315 book.module --- modules/book.module 6 Sep 2005 18:55:41 -0000 1.315 +++ modules/book.module 9 Oct 2005 09:56:45 -0000 @@ -58,11 +58,18 @@ function book_link($type, $node = 0, $ma if ($type == 'node' && isset($node->parent)) { if (!$main) { if (book_access('create', $node)) { - $links[] = l(t('add child page'), "node/add/book/parent/$node->nid"); + $links['book_add_child']->title = t('add child page'); + $links['book_add_child']->link = "node/add/book/parent/$node->nid"; } - $links[] = l(t('printer-friendly version'), 'book/export/html/'. $node->nid, array('title' => t('Show a printer-friendly version of this book page and its sub-pages.'))); - $links[] = l(t('export DocBook XML'), 'book/export/docbook/'. $node->nid, array('title' => t('Export this book page and its sub-pages as DocBook XML.'))); - $links[] = l(t('export OPML'), 'book/export/opml/'. $node->nid, array('title' => t('Export this book page and its sub-pages as OPML.'))); + $links['book_export_html']->title = t('printer-friendly version'); + $links['book_export_html']->link = "book/export/html/$node->nid"; + $links['book_export_html']->entities = array('title' => t('Show a printer-friendly version of this book page and its sub-pages.')); + $links['book_export_docbook']->title = t('export DocBook XML'); + $links['book_export_docbookl']->link = "book/export/docbook/$node->nid"; + $links['book_export_docbook']->entities = array('title' => t('Export this book page and its sub-pages as DocBook XML.')); + $links['book_export_opml']->title = t('export OPML'); + $links['book_export_opml']->link = "book/export/opml/$node->nid"; + $links['book_export_opml']->entities = array('title' => t('Export this book page and its sub-pages as OPML.')); } } Index: modules/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment.module,v retrieving revision 1.369 diff -u -F^f -r1.369 comment.module --- modules/comment.module 7 Sep 2005 20:45:53 -0000 1.369 +++ modules/comment.module 9 Oct 2005 09:56:46 -0000 @@ -195,19 +195,27 @@ function comment_link($type, $node = 0; $new = comment_num_new($node->nid); if ($all) { - $links[] = l(format_plural($all, '1 comment', '%count comments'), "node/$node->nid", array('title' => t('Jump to the first comment of this posting.')), NULL, 'comment'); + $links['comment_comments']->title = l(format_plural($all, '1 comment', '%count comments'); + $links['comment_comments']->link = "node/$node->nid"; + $links['comment_comments']->entities = array('title' => t('Jump to the first comment of this posting.')), + $links['comment_comments']->fraction = 'comment'; if ($new) { - $links[] = l(format_plural($new, '1 new comment', '%count new comments'), "node/$node->nid", array('title' => t('Jump to the first new comment of this posting.')), NULL, 'new'); + $links['comment_comments_new']->title = format_plural($new, '1 new comment', '%count new comments'); + $links['comment_comments_new']->link = "node/$node->nid"; + $links['comment_comments_new']->entities = array('title' => t('Jump to the first new comment of this posting.')); + $links['comment_comments_new']->fraction = 'new'; } } else { if ($node->comment == 2) { if (user_access('post comments')) { - $links[] = l(t('add new comment'), "comment/reply/$node->nid", array('title' => t('Add a new comment to this page.'))); + $links['comment_add']->title = t('add new comment'); + $links['comment_add']->link = "comment/reply/$node->nid"; + $links['comment_add']->entities = array('title' => t('Add a new comment to this page.')); } else { - $links[] = theme('comment_post_forbidden'); + $links['comment_forbidden']->title = theme('comment_post_forbidden'); } } } @@ -219,10 +227,13 @@ function comment_link($type, $node = 0; if ($node->comment == 2 && variable_get('comment_form_location', 0) == 0) { if (user_access('post comments')) { - $links[] = l(t('add new comment'), "comment/reply/$node->nid", array('title' => t('Share your thoughts and opinions related to this posting.')), NULL, 'comment'); + $links['comment_add']->title = t('add new comment'); + $links['comment_add']->link = "comment/reply/$node->nid"; + $links['comment_add']->entities = array('title' => t('Share your thoughts and opinions related to this posting.')); + $links['comment_add']->fraction = 'comment'); } else { - $links[] = theme('comment_post_forbidden'); + $links['comment_forbidden']->title = theme('comment_post_forbidden'); } } } @@ -724,28 +735,35 @@ function comment_links($comment, $return // If we are viewing just this comment, we link back to the node. if ($return) { - $links[] = l(t('parent'), comment_node_url(), NULL, NULL, "comment-$comment->cid"); + $links['comment_parent']->title = t('parent'); + $links['comment_parent']->link = comment_node_url(); + $links['comment_parent']->fraction = "comment-$comment->cid"; } if (node_comment_mode($comment->nid) == 2) { if (user_access('administer comments') && user_access('access administration pages')) { - $links[] = l(t('delete'), "comment/delete/$comment->cid"); - $links[] = l(t('edit'), "comment/edit/$comment->cid"); - $links[] = l(t('reply'), "comment/reply/$comment->nid/$comment->cid"); + $links['comment_delete']->title = t('delete'); + $links['comment_delete']->link = "comment/delete/$comment->cid"; + $links['comment_edit']->title = t('edit'); + $links['comment_delete']->link = "comment/edit/$comment->cid"; + $links['comment_reply']->title = t('reply'); + $links['comment_delete']->link = "comment/reply/$comment->nid/$comment->cid"; } else if (user_access('post comments')) { if (comment_access('edit', $comment)) { - $links[] = l(t('edit'), "comment/edit/$comment->cid"); + $links['comment_edit']->title = t('edit'); + $links['comment_edit']->link = "comment/edit/$comment->cid"); } - $links[] = l(t('reply'), "comment/reply/$comment->nid/$comment->cid"); + $links['comment_reply']->title = t('reply'); + $links['comment_reply']->link = "comment/reply/$comment->nid/$comment->cid"; } else { - $links[] = theme('comment_post_forbidden'); + $links['comment_forbidden']->title = theme('comment_post_forbidden'); } } if ($moderation = comment_moderation_form($comment)) { - $links[] = $moderation; + $links['comment_moderation']->title = $moderation; } return $links; Index: modules/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum.module,v retrieving revision 1.269 diff -u -F^f -r1.269 forum.module --- modules/forum.module 8 Sep 2005 19:22:28 -0000 1.269 +++ modules/forum.module 9 Oct 2005 09:56:47 -0000 @@ -428,11 +428,15 @@ function forum_link($type, $node = 0, $m } if ($prev) { - $links[] = l(t('previous forum topic'), "node/$prev->nid", array('title' => check_plain($prev->title))); + $links['forum_previous']->title = t('previous forum topic'); + $links['forum_previous']->link = "node/$prev->nid"; + $links['forum_previous']->entities = array('title' => check_plain($prev->title)); } if ($next) { - $links[] = l(t('next forum topic'), "node/$next->nid", array('title' => check_plain($next->title))); + $links['forum_next']->title = t('next forum topic'); + $links['forum_next']->link = "node/$next->nid"; + $links['forum_next']->entities = array('title' => check_plain($next->title)); } } Index: modules/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node.module,v retrieving revision 1.527 diff -u -F^f -r1.527 node.module --- modules/node.module 2 Sep 2005 02:11:41 -0000 1.527 +++ modules/node.module 9 Oct 2005 09:56:48 -0000 @@ -673,7 +673,9 @@ function node_link($type, $node = 0, $ma } if ($main == 1 && $node->teaser && $node->readmore) { - $links[] = l(t('read more'), "node/$node->nid", array('title' => t('Read the rest of this posting.'), 'class' => 'read-more')); + $links['node_readmore']->title = t('read more'); + $links['node_readmore']->link = "node/$node->nid"; + $links['node_readmore']->entities = array('title' => t('Read the rest of this posting.'), 'class' => 'read-more'); } } Index: modules/statistics.module =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics.module,v retrieving revision 1.204 diff -u -F^f -r1.204 statistics.module --- modules/statistics.module 25 Aug 2005 21:14:17 -0000 1.204 +++ modules/statistics.module 9 Oct 2005 09:56:48 -0000 @@ -96,7 +96,7 @@ function statistics_link($type, $node = if ($type != 'comment' && variable_get('statistics_display_counter', 0)) { $statistics = statistics_get($node->nid); if ($statistics) { - $links[] = format_plural($statistics['totalcount'], '1 read', '%count reads'); + $links['statistics_count']->title = format_plural($statistics['totalcount'], '1 read', '%count reads'); } } return $links; Index: modules/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v retrieving revision 1.223 diff -u -F^f -r1.223 taxonomy.module --- modules/taxonomy.module 12 Sep 2005 21:55:41 -0000 1.223 +++ modules/taxonomy.module 9 Oct 2005 09:56:49 -0000 @@ -30,12 +30,14 @@ function taxonomy_link($type, $node = NU if (array_key_exists('taxonomy', $node)) { foreach ($node->taxonomy as $tid) { $term = taxonomy_get_term($tid); - $links[] = l($term->name, 'taxonomy/term/'. $term->tid); + $links['taxonomy_term']->title = $term->name; + $links['taxonomy_term']->link = "taxonomy/term/$term->tid"; } } else { foreach (taxonomy_node_get_terms($node->nid) as $term) { - $links[] = l($term->name, 'taxonomy/term/'. $term->tid); + $links['taxonomy_term']->title = $term->name; + $links['taxonomy_term']->link = "taxonomy/term/$term->tid"; } } return $links; Index: modules/upload.module =================================================================== RCS file: /cvs/drupal/drupal/modules/upload.module,v retrieving revision 1.51 diff -u -F^f -r1.51 upload.module --- modules/upload.module 2 Sep 2005 02:11:41 -0000 1.51 +++ modules/upload.module 9 Oct 2005 09:56:50 -0000 @@ -40,7 +40,10 @@ function upload_link($type, $node = 0, $ } } if ($num_files) { - $links[] = l(format_plural($num_files, '1 attachment', '%count attachments'), "node/$node->nid", array('title' => t('Read full article to view attachments.')), NULL, 'attachments'); + $links['upload_attachements']->title = format_plural($num_files, '1 attachment', '%count attachments'); + $links['upload_attachements']->link = "node/$node->nid"; + $links['upload_attachements']->entities = array('title' => t('Read full article to view attachments.')); + $links['upload_attachements']->fraction = 'attachments'; } }