188a189,191
>     'comment_username' => array(
>       'arguments' => array('object' => NULL),
>     ),
1338c1341
<       $form['_author'] = array('#type' => 'item', '#title' => t('Your name'), '#value' => theme('username', $user)
---
>       $form['_author'] = array('#type' => 'item', '#title' => t('Your name'), '#value' => theme('comment_username', $user)
1689c1692
<   $variables['author']    = theme('username', $comment);
---
>   $variables['author']    = theme('comment_username', $comment);
1716c1719
<   $variables['author'] = theme('username', $comment);
---
>   $variables['author'] = theme('comment_username', $comment);
1842c1845
<       '!username' => theme('username', $comment),
---
>       '!username' => theme('comment_username', $comment),
1844a1848,1895
> }
> 
> /**
>  * Format a username for comment module.
>  *  Copy of theme_username, prevent validation problems while theme_username overriding
>  *
>  * @param $object
>  *   The user object to format, usually returned from user_load().
>  * @return
>  *   A string containing an HTML link to the user's page if the passed object
>  *   suggests that this is a site user. Otherwise, only the username is returned.
>  */
> function theme_comment_username($object) {
>   if ($object->uid && $object->name) {
>     // Shorten the name when it is too long or it will break many tables.
>     if (drupal_strlen($object->name) > 20) {
>       $name = drupal_substr($object->name, 0, 15) .'...';
>     }
>     else {
>       $name = $object->name;
>     }
> 
>     if (user_access('access user profiles')) {
>       $output = l($name, 'user/'. $object->uid, array('attributes' => array('title' => t('View user profile.'))));
>     }
>     else {
>       $output = check_plain($name);
>     }
>   }
>   else if ($object->name) {
>     // Sometimes modules display content composed by people who are
>     // not registered members of the site (e.g. mailing list or news
>     // aggregator modules). This clause enables modules to display
>     // the true author of the content.
>     if (!empty($object->homepage)) {
>       $output = l($object->name, $object->homepage, array('attributes' => array('rel' => 'nofollow')));
>     }
>     else {
>       $output = check_plain($object->name);
>     }
> 
>     $output .= ' ('. t('not verified') .')';
>   }
>   else {
>     $output = check_plain(variable_get('anonymous', t('Anonymous')));
>   }
> 
>   return $output;