Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.461
diff -u -F^f -r1.461 common.inc
--- includes/common.inc 27 Jul 2005 01:58:43 -0000 1.461
+++ includes/common.inc 29 Jul 2005 11:45:13 -0000
@@ -965,53 +965,6 @@ function format_date($timestamp, $type =
}
/**
- * Format a username.
- *
- * @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 format_name($object) {
-
- if ($object->uid && $object->name) {
- // Shorten the name when it is too long or it will break many tables.
- if (strlen($object->name) > 20) {
- $name = truncate_utf8($object->name, 15) .'...';
- }
- else {
- $name = $object->name;
- }
-
- if (user_access('access user profiles')) {
- $output = l($name, 'user/'. $object->uid, array('title' => t('View user profile.')));
- }
- else {
- $output = $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 ($object->homepage) {
- $output = ''. $object->name .'';
- }
- else {
- $output = $object->name;
- }
-
- $output .= ' ('. t('not verified') .')';
- }
- else {
- $output = variable_get('anonymous', 'Anonymous');
- }
-
- return $output;
-}
-/**
* @} End of "defgroup format".
*/
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.248
diff -u -F^f -r1.248 theme.inc
--- includes/theme.inc 29 Jul 2005 07:49:43 -0000 1.248
+++ includes/theme.inc 29 Jul 2005 11:45:13 -0000
@@ -580,10 +580,10 @@ function theme_node($node, $teaser = FAL
}
if ($page == 0) {
- $output = '
\n";
$output .= theme('user_picture', $user);
- $output .= '
'. format_name($user) ."
\n";
+ $output .= '
'. theme('username', $user) ."
\n";
foreach ($fields as $field) {
if ($value = profile_view_field($user, $field)) {
Index: modules/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics.module,v
retrieving revision 1.200
diff -u -F^f -r1.200 statistics.module
--- modules/statistics.module 29 Jul 2005 06:59:29 -0000 1.200
+++ modules/statistics.module 29 Jul 2005 11:45:14 -0000
@@ -149,7 +149,7 @@ function statistics_access_log($aid) {
$output .= '
'. t('Page title') .' | '. check_plain($access->title) .' |
---|
';
$output .= '
'. t('Referrer') ." | ". ($access->url ? l($access->url, $access->url) : '') ." |
---|
";
$output .= '
'. t('Date') .' | '. format_date($access->timestamp, 'large') .' |
---|
';
- $output .= '
'. t('User') .' | '. format_name($access) .' |
---|
';
+ $output .= '
'. t('User') .' | '. theme('username', $access) .' |
---|
';
$output .= '
'. t('Hostname') .' | '. check_plain($access->hostname) .' |
---|
';
$output .= '';
return $output;
@@ -173,7 +173,7 @@ function statistics_node_tracker() {
$rows[] = array(
array('data' => format_date($log->timestamp, 'small'), 'class' => 'nowrap'),
l(_statistics_column_width($log->url), $log->url),
- format_name($log),
+ theme('username', $log),
l(t('details'), "admin/logs/access/$log->aid"));
}
@@ -235,7 +235,7 @@ function statistics_recent_hits($type =
$rows[] = array(
array('data' => format_date($log->timestamp, 'small'), 'class' => 'nowrap'),
_statistics_format_item($log->title, $log->path),
- format_name($log),
+ theme('username', $log),
l(t('details'), "admin/logs/access/$log->aid"));
}
@@ -293,7 +293,7 @@ function statistics_top_visitors() {
while ($account = db_fetch_object($result)) {
$qs = drupal_get_destination();
$ban_link = $account->aid ? l(t('unban'), "admin/access/rules/delete/$account->aid", array(), $qs) : l(t('ban'), "admin/access/rules/add/$account->hostname/host", array(), $qs);
- $rows[] = array($account->hits, ($account->uid ? format_name($account) : $account->hostname), format_interval(round($account->total / 1000)), $ban_link);
+ $rows[] = array($account->hits, ($account->uid ? theme('username', $account) : $account->hostname), format_interval(round($account->total / 1000)), $ban_link);
}
if ($pager = theme('pager', NULL, 30, 0, tablesort_pager())) {
Index: modules/tracker.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker.module,v
retrieving revision 1.118
diff -u -F^f -r1.118 tracker.module
--- modules/tracker.module 14 May 2005 17:01:31 -0000 1.118
+++ modules/tracker.module 29 Jul 2005 11:45:14 -0000
@@ -102,7 +102,7 @@ function tracker_page($uid = 0) {
$rows[] = array(
node_invoke($node->type, 'node_name'),
l($node->title, "node/$node->nid") .' '. theme('mark', node_mark($node->nid, $node->changed)),
- format_name($node),
+ theme('username', $node),
array('class' => 'replies', 'data' => $comments),
t('%time ago', array('%time' => format_interval(time() - $node->last_post)))
);
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.493
diff -u -F^f -r1.493 user.module
--- modules/user.module 29 Jul 2005 07:18:36 -0000 1.493
+++ modules/user.module 29 Jul 2005 11:45:14 -0000
@@ -628,7 +628,7 @@ function theme_user_profile($account, $f
*/
function theme_user_list($users, $title = NULL) {
foreach ($users as $user) {
- $items[] = format_name($user);
+ $items[] = theme('username', $user);
}
return theme('item_list', $items, $title);
}
@@ -1711,7 +1711,7 @@ function user_admin_account() {
$status = array(t('blocked'), t('active'));
$destination = drupal_get_destination();
while ($account = db_fetch_object($result)) {
- $rows[] = array(format_name($account),
+ $rows[] = array(theme('username', $account),
$status[$account->status],
format_interval(time() - $account->created),
$account->access ? t('%time ago', array('%time' => format_interval(time() - $account->access))) : t('never'),
Index: modules/watchdog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/watchdog.module,v
retrieving revision 1.123
diff -u -F^f -r1.123 watchdog.module
--- modules/watchdog.module 29 Jul 2005 04:12:19 -0000 1.123
+++ modules/watchdog.module 29 Jul 2005 11:45:14 -0000
@@ -104,7 +104,7 @@ function watchdog_overview() {
t($watchdog->type),
format_date($watchdog->timestamp, 'small'),
truncate_utf8($watchdog->message, 64),
- format_name($watchdog),
+ theme('username', $watchdog),
$watchdog->link,
l(t('details'), "admin/logs/event/$watchdog->wid")
),
@@ -139,7 +139,7 @@ function watchdog_event($id) {
$output .= '
';
$output .= ' '. t('Type') .' | ' . t($watchdog->type) . ' |
';
$output .= ' '. t('Date') .' | '. format_date($watchdog->timestamp, 'large') .' |
';
- $output .= ' '. t('User') .' | '. format_name($watchdog) .' |
';
+ $output .= ' '. t('User') .' | '. theme('username', $watchdog) .' |
';
$output .= ' '. t('Location') ." | ". l($watchdog->location, $watchdog->location) ." |
";
$output .= ' '. t('Referrer') ." | ". l($watchdog->referer, $watchdog->referer) ." |
";
$output .= ' '. t('Message') ." | $watchdog->message |
";
Index: themes/chameleon/chameleon.theme
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v
retrieving revision 1.30
diff -u -F^f -r1.30 chameleon.theme
--- themes/chameleon/chameleon.theme 6 Jun 2005 14:07:04 -0000 1.30
+++ themes/chameleon/chameleon.theme 29 Jul 2005 11:45:14 -0000
@@ -126,7 +126,7 @@ function chameleon_node($node, $main = 0
$output .= " \n";
- $submitted = theme_get_setting("toggle_node_info_$node->type") ? array(t("By %author at %date", array('%author' => format_name($node), '%date' => format_date($node->created, 'small')))) : array();
+ $submitted = theme_get_setting("toggle_node_info_$node->type") ? array(t("By %author at %date", array('%author' => theme('username', $node), '%date' => format_date($node->created, 'small')))) : array();
$terms = array();
if (module_exist('taxonomy')) {
@@ -147,7 +147,7 @@ function chameleon_node($node, $main = 0
}
function chameleon_comment($comment, $link = "") {
- $submitted = array(t('By %author at %date', array('%author' => format_name($comment), '%date' => format_date($comment->timestamp. 'small'))));
+ $submitted = array(t('By %author at %date', array('%author' => theme('username', $comment), '%date' => format_date($comment->timestamp. 'small'))));
$links = array($link);
$output = "