Index: realname.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/realname/realname.module,v
retrieving revision 1.4.4.34
diff -u -r1.4.4.34 realname.module
--- sites/all/modules/realname/realname.module	19 Feb 2009 18:02:33 -0000	1.4.4.34
+++ sites/all/modules/realname/realname.module	22 Feb 2009 07:32:57 -0000
@@ -109,7 +109,7 @@
  */
 function realname_check_breadcrumbs($account) {
   $trail = array(l(t('Home'), ''));
-  if ($account->uid == $GLOBALS['user']->uid && variable_get('realname_use_myacct', TRUE)) {
+  if ($account->uid == $GLOBALS['user']->uid) {
     $trail[] = l(t('My account'), '/user/'. $account->uid);
   }
   else {
@@ -190,13 +190,20 @@
  * Intercept the user page title.
  */
 function realname_user_page_title($account) {
-  if ($account->uid == $GLOBALS['user']->uid && variable_get('realname_use_myacct', TRUE)) {
+  global $base_path;
+  if ($account->uid == $GLOBALS['user']->uid) {
     $name = t('My account');
+    $userpage_url = $base_path . 'user/' . $account->uid . '/';
+    # works with enabled "Clean URLs"
+    $pos = strpos($_SERVER['SCRIPT_URL'] . '/', $userpage_url);
+    if ($pos !== false && $pos == 0) {
+      $title = (isset($account->realname) ? $account->realname : realname_make_name($account));
+      drupal_set_title(check_plain($title));
+    }
   }
   else {
     $name = (isset($account->realname) ? $account->realname : realname_make_name($account));
   }
-  drupal_set_title(check_plain($name));
   return check_plain($name);
 }
 
@@ -719,13 +726,6 @@
     '#default_value' => variable_get('realname_notver', TRUE),
     );
 
-  $form['realname_use_myacct'] = array(
-    '#type' => 'checkbox',
-    '#title' => '<strong>'. t('Show "My Account"') .'</strong>',
-    '#description' => t('Drupal core shows "My Account" rather than the user name when viewing one\'s own profile. Uncheck this to show the real name.'),
-    '#default_value' => variable_get('realname_use_myacct', TRUE),
-    );
-
   // If there were any URL fields, give a home page option.
   if ($links) {
     $links[''] = t('');
@@ -782,7 +782,6 @@
   variable_set('realname_nodeapi', $form_state['values']['realname_nodeapi']);
   variable_set('realname_notver', $form_state['values']['realname_notver']);
   variable_set('realname_nofollow', $form_state['values']['realname_nofollow']);
-  variable_set('realname_use_myacct', $form_state['values']['realname_use_myacct']);
   variable_set('realname_homepage', $form_state['values']['realname_homepage']);
 
   drupal_set_message(t('Configuration has been updated.'), 'status');