aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/ucp.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-11-16 16:51:19 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-11-16 16:51:19 +0000
commitc9cd0e1d914b779dfc6cb491b240d48fe2d4c9b0 (patch)
treef873225570ad31ebcc9c26082913d290eaeda71a /phpBB/ucp.php
parent683c8a10dd678b9579ed38cfb5fbfb9285a5d5e8 (diff)
downloadforums-c9cd0e1d914b779dfc6cb491b240d48fe2d4c9b0.tar
forums-c9cd0e1d914b779dfc6cb491b240d48fe2d4c9b0.tar.gz
forums-c9cd0e1d914b779dfc6cb491b240d48fe2d4c9b0.tar.bz2
forums-c9cd0e1d914b779dfc6cb491b240d48fe2d4c9b0.tar.xz
forums-c9cd0e1d914b779dfc6cb491b240d48fe2d4c9b0.zip
ok, change from doing the same logic all over again we call a function to do it for us. Also allow template designers to choose which method to use by just adding a fully compiled username string (profile link + user colour). This commit may introduce problems.
git-svn-id: file:///svn/phpbb/trunk@6589 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/ucp.php')
-rwxr-xr-xphpBB/ucp.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index f0758e752e..397ab50847 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -274,11 +274,12 @@ while ($row = $db->sql_fetchrow($result))
$which = (time() - $update_time < $row['online_time'] && $row['viewonline'] && $row['user_allow_viewonline']) ? 'online' : 'offline';
$template->assign_block_vars("friends_{$which}", array(
- 'U_PROFILE' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&amp;u=' . $row['user_id']),
-
'USER_ID' => $row['user_id'],
- 'USER_COLOUR' => ($row['user_colour']) ? '#' . $row['user_colour'] : '',
- 'USERNAME' => $row['username'])
+
+ 'U_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
+ 'USER_COLOUR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),
+ 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
+ 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']))
);
}
$db->sql_freeresult($result);