RealName integration: theme username in block

applied to dev

This patch has introduced an issue for users who aren't using the realname module. The theme_username function is generating markup which is being placed in the select box. Unfortunately the stock theme_username function for D6 does not take extra parameters so the array('plain' => TRUE) does nothing for users who don't have realname installed.

This will affect admin users and users with the "Access user profiles" permission. See pic attached

Reverted.. feel free to supply a working patch

Couldn't you simply wrap it as such:

'@name' => module_exists('RealName')) ? $revision->name : theme('username', $revision, array('plain' => TRUE)),

(not sure if 'realname' should be lowercase)

Marked #1229206: Inline Diff block menu garbled html code instead of plain text options as fixed with the revert of realname patch.

Updated issue summary.

• Bumping to 7.x-3.x branch.
• Updated issue summary to link to RealName.
• Updated title to reflect this is related to RealName project.
• Marked issue in #6 as a duplicate.
• Setting back to active, since patch in OP introduces errors.

Normally in D7 we should use http://api.drupal.org/api/drupal/includes%21common.inc/function/format_u... for formating usernames and this will allow realname to hook into. This does not required any module_exists() conditions. I'm not sure about the html code. May required strip_tags().

This patch appears to handle all fields - tested using Name Field modules real name integration.

format_username() says the code receiving this result is responsible for calling check_plain(). I don't think we need to pass in full $account objects, since the $revision objects have a name defined, and format_username() says

By default, the passed-in object's 'name' property is used if it exists

Ah, but these didn't show correctly when testing when passing the node itself, even though this has both uid / name.

Can you confirm that these work with the RealName module is used? Maybe there is a bug in the Name Field modules implementation. I ran tests with the current user being author and anonymous authors on content too.

i.e. revert to one of these forms and try.

     $form['revision']['#options'][$revision->vid] = t('@revision by @name', array(
       '@revision' => format_date($revision->timestamp, 'short'),
       '@name' => format_username($revision),
     ));
# other general format
   $old_header = t('!date by !username', array(
     '!date' => l(format_date($old_node->revision_timestamp), "node/$node->nid/revisions/$old_node->vid/view", array('absolute' => 1)),
     '!username' => theme('username', array('account' => $node_revisions[$old_vid])),
   ));

But there is a issue with the patch with the first account load in diff_inline_form() - this should be $revision and not $node.

Related to check_plain(), can you expand on the issue please?

The code assumes that these are escaped by theme_username() by using "!".

+          '!username' => theme('username', array('account' => $account)))) . $revision_log,

As the string is escaped in theme_username() preprocesser template_preprocess_username()

  $name = $variables['name_raw'] = format_username($account);
  if (drupal_strlen($name) > 20) {
    $name = drupal_substr($name, 0, 15) . '...';
  }
  $variables['name'] = check_plain($name);

And the one line that uses format_username() uses "@" to escape the string.

+      '@name' => format_username($account),

OK, sadly it looks like you need to handle a user_load() within hook_username_alter(). I'll re-roll tonight, but please let me know what you think I missed with the escaping of the code.

Quick re-roll. The I fixed the Name Field module "bug" [imho, this function should be getting a loaded user entity only, but core mixes and matches depending on the area] and retested.

Patch is reduced to just the user inline block code and uses format_username().

This patch worked for me, the "inline differences" block shows realnames where before it was always just a user name. You were absolutely right about not needing to escape the format_username, @name is sufficient - sorry about that.

Thanks, committed.