The zebra ran into a paint factory

git-svn-id: file:///svn/phpbb/trunk@6454 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames 2006-10-07 14:12:50 +00:00
parent e4a4bd0d4e
commit 66c78d114b
2 changed files with 6 additions and 5 deletions

View file

@ -125,7 +125,7 @@
<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
<!-- BEGIN friends_online -->
<li><a href="{friends_online.U_PROFILE}">{friends_online.USERNAME}</a>
<li><a href="{friends_online.U_PROFILE}"<!-- IF friends_online.USER_COLOUR --> style="color: {friends_online.USER_COLOUR}"<!-- ENDIF -->>{friends_online.USERNAME}</a>
<!-- IF S_SHOW_PM_BOX -->
&nbsp;[ <input class="post" style="font-size: 90%;" type="submit" name="add_to[{friends_online.USER_ID}]" value="{L_ADD}" /> ]
<!-- ENDIF -->
@ -141,7 +141,7 @@
<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
<!-- BEGIN friends_offline -->
<li><a href="{friends_offline.U_PROFILE}">{friends_offline.USERNAME}</a>
<li><a href="{friends_offline.U_PROFILE}"<!-- IF friends_offline.USER_COLOUR --> style="color: {friends_offline.USER_COLOUR}"<!-- ENDIF -->>{friends_offline.USERNAME}</a>
<!-- IF S_SHOW_PM_BOX -->
&nbsp;[ <input class="post" style="font-size: 90%;" type="submit" name="add_to[{friends_offline.USER_ID}]" value="{L_ADD}" /> ]
<!-- ENDIF -->

View file

@ -244,7 +244,7 @@ if (!$user->data['is_registered'])
$update_time = $config['load_online_time'] * 60;
$sql = $db->sql_build_query('SELECT_DISTINCT', array(
'SELECT' => 'u.user_id, u.username, u.user_allow_viewonline, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline',
'SELECT' => 'u.user_id, u.username, u.user_colour, u.user_allow_viewonline, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline',
'FROM' => array(
USERS_TABLE => 'u',
@ -276,8 +276,9 @@ while ($row = $db->sql_fetchrow($result))
$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'],
'USERNAME' => $row['username'])
'USER_ID' => $row['user_id'],
'USER_COLOUR' => ($row['user_colour']) ? '#' . $row['user_colour'] : '',
'USERNAME' => $row['username'])
);
}
$db->sql_freeresult($result);