4 files changed, 6 insertions, 6 deletions

diff --git a/modules/forum.module b/modules/forum.module
index a8a05d1b8..a1220f8e2 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -321,7 +321,8 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
   global $user, $forum_topic_list_header;
 
   $forum_topic_list_header = array(
-      array("data" => t("Topic"), "field" => "n.title", "colspan" => "2"),
+      array("data" => " "),
+      array("data" => t("Topic"), "field" => "n.title"),
       array("data" => t("Replies"),"field" => "num_comments"),
       array("data" => t("Created"), "field" => "n.created"),
       array("data" => t("Last reply"), "field" => "date_sort", "sort" => "desc"),
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index a8a05d1b8..a1220f8e2 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -321,7 +321,8 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
   global $user, $forum_topic_list_header;
 
   $forum_topic_list_header = array(
-      array("data" => t("Topic"), "field" => "n.title", "colspan" => "2"),
+      array("data" => " "),
+      array("data" => t("Topic"), "field" => "n.title"),
       array("data" => t("Replies"),"field" => "num_comments"),
       array("data" => t("Created"), "field" => "n.created"),
       array("data" => t("Last reply"), "field" => "date_sort", "sort" => "desc"),
diff --git a/modules/statistics.module b/modules/statistics.module
index 8a83afcb9..69948922c 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -637,12 +637,11 @@ function statistics_display_online_block() {
       if (user_access("access userlist") && $users) {
         /* Display a list of currently online users */
         $max_users = variable_get("statistics_block_online_max_cnt", 10);
-        $max_name_len = variable_get("statistics_block_online_max_len", 15);
         $uid = reset($user_list);
         while (($uid) && ($max_users)) {
           $user = user_load(array("uid" => $uid));
           /* When displaying name, be sure it's not more than defined max length */
-          $items[] = l((strlen($user->name) > $max_name_len ? substr($user->name, 0, $max_name_len) ."..." : $user->name), "user/view/$user->uid");
+          $items[] = format_name($user);
           $uid = next($user_list);
           /*
           ** When $max_users reaches zero, we break out even if there are
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index 8a83afcb9..69948922c 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -637,12 +637,11 @@ function statistics_display_online_block() {
       if (user_access("access userlist") && $users) {
         /* Display a list of currently online users */
         $max_users = variable_get("statistics_block_online_max_cnt", 10);
-        $max_name_len = variable_get("statistics_block_online_max_len", 15);
         $uid = reset($user_list);
         while (($uid) && ($max_users)) {
           $user = user_load(array("uid" => $uid));
           /* When displaying name, be sure it's not more than defined max length */
-          $items[] = l((strlen($user->name) > $max_name_len ? substr($user->name, 0, $max_name_len) ."..." : $user->name), "user/view/$user->uid");
+          $items[] = format_name($user);
           $uid = next($user_list);
           /*
           ** When $max_users reaches zero, we break out even if there are