Index: guestbook.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/guestbook/guestbook.module,v
retrieving revision 1.1.10.16
diff -u -p -r1.1.10.16 guestbook.module
--- guestbook.module	10 Mar 2009 23:15:06 -0000	1.1.10.16
+++ guestbook.module	13 Mar 2009 19:35:59 -0000
@@ -1,4 +1,4 @@
-<?php
+pi<?php
 // $Id: guestbook.module,v 1.1.10.16 2009/03/10 23:15:06 sun Exp $
 
 if (module_exists("spam") == true) {
@@ -737,24 +737,24 @@ function theme_guestbook_user_picture($u
       $picture = variable_get('user_picture_default', '');
     }
 
-    if (variable_get('guestbook_mode', -1) == GUESTBOOK_SITE_GUESTBOOK && user_access('access user profiles')) {
-      $user_link = "user/$account->uid";
-      $user_text = t('View user profile.');
-    }
-    else if (variable_get('guestbook_user_link_to', 'profile') == 'profile' && user_access('access user profiles')) {
-      $user_link = 'user/'. $account->uid;
-      $user_text = t('View user profile.');
-    }
-    else if (variable_get('guestbook_user_link_to', 'profile') == 'guestbook' && user_access('access user guestbooks')) {
-      $user_link = "guestbook/$account->uid";
-      $user_text = t('View user guestbook.');
+   if (variable_get('guestbook_user_link_to', 'profile') == 'profile' && user_access('access user profiles')) {
+      $output = theme('username',$account);    
     }
+   else {
+     if (variable_get('guestbook_mode', -1) == GUESTBOOK_SITE_GUESTBOOK && user_access('access user profiles')) {
+       $user_link = "user/$account->uid";
+       $user_text = t('View user profile.'); 
+     }
+     else if (variable_get('guestbook_user_link_to', 'profile') == 'guestbook' && user_access('access user guestbooks')) {
+       $user_link = "guestbook/$account->uid";
+       $user_text = t('View user guestbook.');
+     }
     else {
       $user_link = 'guestbook';
       $user_text = t('View guestbooks.');
     }
-
-    $output = l($account->name ? $account->name : variable_get('anonymous', 'Anonymous'), $user_link, array('title' => $user_text));
+     $output = l($account->name ? $account->name : variable_get('anonymous', 'Anonymous'), $user_link, array('title' => $user_text));
+   }
 
     if (isset($picture)) {
       $alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', 'Anonymous')));