cvs diff: Diffing .
cvs diff: Diffing database
cvs diff: Diffing includes
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.264
diff -u -F^f -r1.264 theme.inc
--- includes/theme.inc	3 Nov 2005 19:33:37 -0000	1.264
+++ includes/theme.inc	8 Nov 2005 12:21:15 -0000
@@ -463,17 +463,31 @@ function theme_status_messages() {
  * Return a themed set of links.
  *
  * @param $links
- *   An array of links to be themed.
+ *   A 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 = ' | ') {
-  if (!is_array($links)) {
+  if (is_array($links)) {
+    foreach ($links as $link) {
+      if ($link->href && substr($link->link, 0, 7) == 'http://') {
+        $output[] = '<a href="'. check_url($link->href) .'"'. drupal_attributes($link->attributes) .'>'. check_plain($link->text) .'</a>';
+      }
+      elseif ($link->href) {
+        $output[] = l($link->title, $link->href, $link->attributes, $link->query, $link->fragment);
+      }
+      elseif ($link->title) {
+        //Some links are actually not links ...
+        $output[] = $link->title;
+      }
+    }
+  return $output ? implode($delimiter, $output) : NULL;
+  }
+  else {
     return '';
   }
-  return implode($delimiter, $links);
 }
 
 /**
cvs diff: Diffing misc
cvs diff: Diffing modules
Index: modules/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog.module,v
retrieving revision 1.234
diff -u -F^f -r1.234 blog.module
--- modules/blog.module	1 Nov 2005 10:17:34 -0000	1.234
+++ modules/blog.module	8 Nov 2005 12:21:15 -0000
@@ -256,7 +256,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_usernames_blog']->title = t("%username's blog", array('%username' => $node->name));
+      $links['blog_usernames_blog']->href = "blog/$node->uid";
+      $links['blog_usernames_blog']->attributes = 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.327
diff -u -F^f -r1.327 book.module
--- modules/book.module	1 Nov 2005 10:17:34 -0000	1.327
+++ modules/book.module	8 Nov 2005 12:21:17 -0000
@@ -17,7 +17,7 @@ function book_node_info() {
  * Implementation of hook_perm().
  */
 function book_perm() {
-  return array('create book pages', 'maintain books', 'edit own book pages', 'export books', 'see printer-friendly version');
+  return array('create book pages', 'maintain books', 'edit own book pages');
 }
 
 /**
@@ -58,15 +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");
-      }
-      if (user_access('see printer-friendly version')) {
-        $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.')));
-      }
-      if (user_access('export books')) {
-        $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_add_child']->title = t('add child page');
+        $links['book_add_child']->href = "node/add/book/parent/$node->nid";
       }
+      $links['book_export_html']->title = t('printer-friendly version');
+      $links['book_export_html']->href = "book/export/html/$node->nid";
+      $links['book_export_html']->attributes = 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_docbook']->href = "book/export/docbook/$node->nid";
+      $links['book_export_docbook']->attributes = 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']->href = "book/export/opml/$node->nid";
+      $links['book_export_opml']->attributes = array('title' => t('Export this book page and its sub-pages as OPML.'));
     }
   }
 
@@ -114,7 +117,7 @@ function book_menu($may_cache) {
     $items[] = array(
       'path' => 'book/export',
       'callback' => 'book_export',
-      'access' => (user_access('export books') || user_access('see printer-friendly version')) && user_access('access content'),
+      'access' => user_access('access content'),
       'type' => MENU_CALLBACK);
   }
   else {
Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.385
diff -u -F^f -r1.385 comment.module
--- modules/comment.module	1 Nov 2005 10:17:34 -0000	1.385
+++ modules/comment.module	8 Nov 2005 12:21:18 -0000
@@ -145,19 +145,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 = format_plural($all, '1 comment', '%count comments');
+          $links['comment_comments']->href = "node/$node->nid";
+          $links['comment_comments']->attributes = array('title' => t('Jump to the first comment of this posting.'));
+          $links['comment_comments']->fragment = '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']->href = "node/$node->nid";
+            $links['comment_comments_new']->attributes = array('title' => t('Jump to the first new comment of this posting.'));
+            $links['comment_comments_new']->fragment = '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']->href = "comment/reply/$node->nid";
+              $links['comment_add']->attributes = array('title' => t('Add a new comment to this page.'));
             }
             else {
-              $links[] = theme('comment_post_forbidden');
+              $links['comment_post_forbidden']->title = theme('comment_post_forbidden');
             }
           }
         }
@@ -169,10 +177,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']->href = "comment/reply/$node->nid";
+          $links['comment_add']->attributes = array('title' => t('Share your thoughts and opinions related to this posting.'));
+          $links['comment_add']->fragment = 'comment';
         }
         else {
-          $links[] = theme('comment_post_forbidden');
+          $links['comment_post_forbidden'] = theme('comment_post_forbidden');
         }
       }
     }
@@ -690,23 +701,30 @@ 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']->href = comment_node_url();
+    $links['comment_parent']->fragment = "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']->href = "comment/delete/$comment->cid";
+      $links['comment_edit']->title = t('edit');
+      $links['comment_edit']->href = "comment/edit/$comment->cid";
+      $links['comment_reply']->title = t('reply');
+      $links['comment_reply']->href = "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']->href = "comment/edit/$comment->cid";
       }
-      $links[] = l(t('reply'), "comment/reply/$comment->nid/$comment->cid");
+      $links['comment_reply']->title = t('reply');
+      $links['comment_reply']->href = "comment/reply/$comment->cid";
     }
     else {
-      $links[] = theme('comment_post_forbidden');
+      $links['comment_post_forbidden'] = theme('comment_post_forbidden');
     }
   }
 
Index: modules/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum.module,v
retrieving revision 1.282
diff -u -F^f -r1.282 forum.module
--- modules/forum.module	4 Nov 2005 19:40:26 -0000	1.282
+++ modules/forum.module	8 Nov 2005 12:21:19 -0000
@@ -422,11 +422,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_topic']->title = t('previous forum topic');
+      $links['forum_previous_topic']->href = "node/$prev->nid";
+      $links['forum_previous_topic']->attributes = 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_topic']->title = t('next forum topic');
+      $links['forum_next_topic']->href = "node/$next->nid";
+      $links['forum_next_topic']->attributes = array('title' => check_plain($next->title));
     }
   }
 
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.545
diff -u -F^f -r1.545 node.module
--- modules/node.module	4 Nov 2005 19:40:28 -0000	1.545
+++ modules/node.module	8 Nov 2005 12:21:21 -0000
@@ -840,7 +840,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_read_more']->title = t('read more');
+      $links['node_read_more']->href = "node/$node->nid"; 
+      $links['node_read_more']->attributes = 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.211
diff -u -F^f -r1.211 statistics.module
--- modules/statistics.module	1 Nov 2005 10:17:34 -0000	1.211
+++ modules/statistics.module	8 Nov 2005 12:21:22 -0000
@@ -99,7 +99,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_counter']->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.233
diff -u -F^f -r1.233 taxonomy.module
--- modules/taxonomy.module	1 Nov 2005 10:17:34 -0000	1.233
+++ modules/taxonomy.module	8 Nov 2005 12:21:23 -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_path($term));
+        $links['taxonomy_term_'. $tid]->title = $term->name;
+        $links['taxonomy_term_'. $tid]->href = "taxonomy/term/$term->tid";
       }
     }
     else {
       foreach (taxonomy_node_get_terms($node->nid) as $term) {
-        $links[] = l($term->name, taxonomy_term_path($term));
+        $links['taxonomy_term_'. $tid]->title = $term->name;
+        $links['taxonomy_term_'. $tid]->href = "taxonomy/term/$term->tid";
       }
     }
     return $links;
Index: modules/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload.module,v
retrieving revision 1.57
diff -u -F^f -r1.57 upload.module
--- modules/upload.module	1 Nov 2005 10:17:34 -0000	1.57
+++ modules/upload.module	8 Nov 2005 12:21:24 -0000
@@ -52,7 +52,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_attachments']->title = format_plural($num_files, '1 attachment', '%count attachments');
+      $links['upload_attachments']->href = "node/$node->nid";
+      $links['upload_attachments']->attributes = array('title' => t('Read full article to view attachments.'));
+      $links['upload_attachments']->fragment = 'attachments';
     }
   }