--- blog_addons.module.orig     2008-05-31 01:25:21.000000000 +0200
+++ blog_addons.module  2009-07-14 11:46:05.000000000 +0200
@@ -139,7 +139,7 @@ function blog_addons_bloggers()
   $query = "SELECT COUNT(DISTINCT(u.name)) FROM {users} u INNER JOIN {node} n ON u.uid = n.uid WHERE n.type = 'blog'";
   $counts = db_rewrite_sql($query);
 
-  $query = "SELECT u.name, COUNT(n.uid) AS nposts FROM {users} u INNER JOIN {node} n ON u.uid = n.uid WHERE n.status=1 AND n.type = 'blog' GROUP BY u.uid " . $sortby;
+  $query = "SELECT u.name, u.uid, COUNT(n.uid) AS nposts FROM {users} u INNER JOIN {node} n ON u.uid = n.uid WHERE n.status=1 AND n.type = 'blog' GROUP BY u.uid " . $sortby;
   $result = pager_query(db_rewrite_sql($query), variable_get('blog_addons_nbloggers', 20),0,$counts);
 
   blog_addons_show_bloggers($result,$pager_attrib );
@@ -160,7 +160,7 @@ function blog_addons_show_bloggers($resu
   $content .= "]</div><br> ";               
   while ($blogger = db_fetch_object($result))
   {
-    $content .= l($blogger->name,'blog/'.$blogger->name) . "  (" . $blogger->nposts . ") <br>";
+    $content .= l(check_plain(theme('username', $blogger)),'blog/'.$blogger->uid) . "  (" . $blogger->nposts . ") <br>";
   }
 
   $content .= theme('pager',0,variable_get('blog_addons_nbloggers', 20));
@@ -268,13 +268,13 @@ function blog_addons_block($op='list', $
       $bcontent .= "<li>" . l(t("My blog"),'blog/'. $user->name) . "</li>";
       $bcontent .= "<li>" . l('Post new blog entry','node/add/blog') . "</li>";
       $bcontent .= "<li>Top bloggers </li>";
-      $query = "SELECT u.name, COUNT(n.uid) AS nposts FROM {users} u INNER JOIN {node} n ON u.uid = n.uid WHERE n.status=1 AND n.type = 'blog' GROUP BY u.uid  ORDER BY nposts DESC LIMIT " . variable_get('blog_addons_ntopbloggers', 5);
+      $query = "SELECT u.name, u.uid, COUNT(n.uid) AS nposts FROM {users} u INNER JOIN {node} n ON u.uid = n.uid WHERE n.status=1 AND n.type = 'blog' GROUP BY u.uid  ORDER BY nposts DESC LIMIT " . variable_get('blog_addons_ntopbloggers', 5);
       $result = db_query(db_rewrite_sql($query));
       $bcontent .= "<ul>";
 
       while ($blogger = db_fetch_object($result))
      {
-       $bcontent .= "<li> " . l($blogger->name,'blog/'.$blogger->name) . "  (" . $blogger->nposts . ") </li>";
+       $bcontent .= "<li> " . l(theme('username',$blogger),'blog/'.$blogger->name) . "  (" . $blogger->nposts . ") </li>";
      }
      $more_attr = array("title"=>t("Click for more bloggers"));
      $bcontent .= "<li>" . l(t("more ..."), 'blogs/blogs', array('attributes' => $more_attr, 'query' => "&sort=nposts&order=desc")) . "</li>";
@@ -292,7 +292,7 @@ function blog_addons_block($op='list', $
     $query = "SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 AND n.uid = " . $account->uid . " ORDER By n.created DESC ";
     $result = db_query(db_rewrite_sql($query));
     $bcontent .= "<ul>";
-    $bcontent .= "<li>" . l($account->name . '\'s home page', 'blog/' . $account->name) . "</li>";
+    $bcontent .= "<li>" . l(theme('username',$account) . '\'s home page', 'blog/' . $account->name) . "</li>";
     if ($user->uid == $account->uid)
       {
       $bcontent .= "<li>" . l('Post new blog entry','node/add/blog') . "</li>";
@@ -338,7 +338,7 @@ function blog_addons_block($op='list', $
     $bcontent .= "</ul>";
     }
   
-  $block['title'] = t($account->name . '\'s blog');
+  $block['title'] = t(theme('username',$account) . '\'s blog');
   $block['content'] = $bcontent;
   return $block;
   }
@@ -454,7 +454,8 @@ function blog_addons_user_page_title($us
    else         
      $tempuser = user_load(array('name' => $user));
 
-$title = $tempuser->name . "'s blog";
+
+$title = check_plain(theme('username', $tempuser)) . "'s blog";
 
 return $title;
 }