- Applied Alastair's date patch.

- Removed all instances of '$user->nodes'.

- Committed Moshe's taxonomy patch - minus the node_compact_list() bit.  It needs a bit more thought/work.  This patch changes the links of taxonomy pages/feeds so update your custom code and themes accordingly!

Themes should now use "taxonomy_link("taxonomy terms", $node)" to get an array of taxonomy term links.  The old construct is deprecated and should be changed.

// old theme blob:
if (function_exists("taxonomy_node_get_terms")) {
  foreach (taxonomy_node_get_terms($node->nid) as $term) {
    $terms[] = l($term->name, NULL, array(), "or=$term->tid");
  }
}

// new theme blob:
if (module_exist("taxonomy")) {
  $terms = taxonomy_link("taxonomy terms", $node);
}

// old URL:
http://foo.com/index.php?or=1,2

// new URL:
http://foo.com/?q=taxonomy/page/or/1,2

1 files changed, 4 insertions, 4 deletions

diff --git a/modules/blog.module b/modules/blog.module
index 06747b516..16ac41932 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -155,23 +155,23 @@ function blog_page_user($uid = 0) {
     $account = $user;
   }
 
-  $result = pager_query("SELECT nid FROM node WHERE type = 'blog' AND uid = '$account->uid' AND status = 1 ORDER BY nid DESC", $user->nodes ? $user->nodes : variable_get("default_nodes_main", 10));
+  $result = pager_query("SELECT nid FROM node WHERE type = 'blog' AND uid = '$account->uid' AND status = 1 ORDER BY nid DESC", variable_get("default_nodes_main", 10));
   while ($node = db_fetch_object($result)) {
     node_view(node_load(array("nid" => $node->nid)), 1);
   }
-  print pager_display(NULL, ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10)));
+  print pager_display(NULL, variable_get("default_nodes_main", 10));
   print l("<img align=\"right\" src=\"". $theme->image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name))));
 }
 
 function blog_page_last() {
   global $user, $theme;
 
-  $result = pager_query("SELECT nid FROM node WHERE type = 'blog' AND status = 1 ORDER BY nid DESC", $user->nodes ? $user->nodes : variable_get("default_nodes_main", 10));
+  $result = pager_query("SELECT nid FROM node WHERE type = 'blog' AND status = 1 ORDER BY nid DESC", variable_get("default_nodes_main", 10));
 
   while ($node = db_fetch_object($result)) {
     $output = node_view(node_load(array("nid" => $node->nid)), 1);
   }
-  $output .= pager_display(NULL, ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10)));
+  $output .= pager_display(NULL, variable_get("default_nodes_main", 10));
   $output .= l("<img align=\"right\" src=\"". $theme->image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed", array("title" => t("Read the XML version of all blogs.")));
   return $output;
 }