summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-01 21:26:44 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-01 21:26:44 +0000
commitca8eee7545f75c199bde0121bd6a0792d67c5b91 (patch)
tree5e805f30c93c7a005e0cb422dd0ea95ca849d84f /modules/user/user.module
parentb882d991d01544fb458cb58614fdba4fab0997eb (diff)
downloadbrdo-ca8eee7545f75c199bde0121bd6a0792d67c5b91.tar.gz
brdo-ca8eee7545f75c199bde0121bd6a0792d67c5b91.tar.bz2
#192056 by effulgentsia, Dave Cohen, andypost, hswong3i, geodaniel, pwolanin, and dahacouk: Ensure user's raw login name is never output directly.
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index b35d10268..d8a60d8d3 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1251,7 +1251,7 @@ function template_preprocess_user_picture(&$variables) {
$filepath = variable_get('user_picture_default', '');
}
if (isset($filepath)) {
- $alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous'))));
+ $alt = t("@user's picture", array('@user' => format_username($account)));
if (module_exists('image') && $style = variable_get('user_picture_style', '')) {
$variables['user_picture'] = theme('image_style', array('style_name' => $style, 'path' => $filepath, 'alt' => $alt, 'title' => $alt, 'attributes' => array(), 'getsize' => FALSE));
}
@@ -1632,7 +1632,7 @@ function user_uid_optional_to_arg($arg) {
* Menu item title callback - use the user name.
*/
function user_page_title($account) {
- return $account->name;
+ return format_username($account);
}
/**