Index: modules/blog/blog.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.pages.inc,v
retrieving revision 1.6
diff -u -r1.6 blog.pages.inc
--- modules/blog/blog.pages.inc	21 Jan 2008 12:05:36 -0000	1.6
+++ modules/blog/blog.pages.inc	8 Feb 2008 13:43:40 -0000
@@ -26,10 +26,22 @@
   $output = theme('item_list', $items);
 
   $result = pager_query(db_rewrite_sql("SELECT n.nid, n.sticky, n.created FROM {node} n WHERE n.type = 'blog' AND n.uid = %d AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC"), variable_get('default_nodes_main', 10), 0, NULL, $account->uid);
+  $num_rows = FALSE;
   while ($node = db_fetch_object($result)) {
     $output .= node_view(node_load($node->nid), 1);
+    $num_rows = TRUE;
+  }
+  if ($num_rows) {
+    $output .= theme('pager', NULL, variable_get('default_nodes_main', 10));
+  }
+  else {
+    if ($account->uid == $user->uid) {
+      drupal_set_message(t('You have not created any blog entries.'), 'status');
+    }
+    else {
+      drupal_set_message(t('!author has not created any blog entries.', array('!author' => theme('username', $account))), 'status');
+    }
   }
-  $output .= theme('pager', NULL, variable_get('default_nodes_main', 10));
   drupal_add_feed(url('blog/'. $account->uid .'/feed'), t('RSS - !title', array('!title' => $title)));
 
   return $output;
@@ -42,13 +54,27 @@
   global $user;
 
   $output = '';
+  $items = array();
+
+  if (user_access('edit own blog')) {
+    $items[] = l(t('Create new blog entry.'), "node/add/blog");
+  }
+
+  $output = theme('item_list', $items);
 
   $result = pager_query(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC"), variable_get('default_nodes_main', 10));
+  $num_rows = FALSE;
 
   while ($node = db_fetch_object($result)) {
     $output .= node_view(node_load($node->nid), 1);
+    $num_rows = TRUE;
+  }
+  if ($num_rows) {
+    $output .= theme('pager', NULL, variable_get('default_nodes_main', 10));
+  }
+  else {
+    drupal_set_message(t('No blog entries have been created.'), 'status');
   }
-  $output .= theme('pager', NULL, variable_get('default_nodes_main', 10));
   drupal_add_feed(url('blog/feed'), t('RSS - blogs'));
 
   return $output;