--- guestbook.module	2007-03-03 05:10:09.000000000 +0800
+++ guestbook.module	2007-09-19 16:59:15.000000000 +0800
@@ -201,6 +201,14 @@ function guestbook_admin_settings() {
     '#type' => 'fieldset',
     '#title' => t('User guestbooks'),
     '#description' => t('Users can individually disable their guestbook or add an intro text on the user account page.'));
+
+  $form['user_guestbooks']['guestbook_user_link_to'] = array(
+    '#type' => 'radios',
+    '#title' => t('User link to profile or guestbook'),
+    '#description' => t('When displaying a user should the link show the user profile or the user guestbook?'),
+    '#options' => array('profile' => t('User profile'), 'guestbook' => t('User guestbook')),
+    '#default_value' => variable_get('guestbook_user_link_to', 'profile'),
+  );
   
   // Display options
   $form['display_options'] = array(
@@ -668,7 +676,11 @@ function theme_guestbook_user_picture($u
        $user_link =  "user/$account->uid";
        $user_text = t('View user profile.');
     }
-    else if (user_access('access user guestbooks')) {
+    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.');
     }