mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 16:56:44 +02:00
- fixing a bunch of bugs
- moved the install trigger error to sessions and also disabled it for those having DEBUG_EXTRA enabled. i hope not having introduced too many new bugs. git-svn-id: file:///svn/phpbb/trunk@6628 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -1166,15 +1166,30 @@ function write_pm_addresses($check_ary, $author_id, $plaintext = false)
|
||||
{
|
||||
foreach ($adr_ary as $id => $row)
|
||||
{
|
||||
$template->assign_block_vars($check_type . '_recipient', array(
|
||||
'NAME' => $row['name'],
|
||||
'IS_GROUP' => ($type == 'group'),
|
||||
'IS_USER' => ($type == 'user'),
|
||||
'COLOUR' => ($row['colour']) ? $row['colour'] : '',
|
||||
$tpl_ary = array(
|
||||
'IS_GROUP' => ($type == 'group') ? true : false,
|
||||
'IS_USER' => ($type == 'user') ? true : false,
|
||||
'UG_ID' => $id,
|
||||
'U_VIEW' => ($type == 'user') ? (($id != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $id) : '') : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $id),
|
||||
'TYPE' => $type)
|
||||
'NAME' => $row['name'],
|
||||
'COLOUR' => ($row['colour']) ? '#' . $row['colour'] : '',
|
||||
'TYPE' => $type,
|
||||
);
|
||||
|
||||
if ($type == 'user')
|
||||
{
|
||||
$tpl_ary = array_merge($tpl_ary, array(
|
||||
'U_VIEW' => get_username_string('profile', $id, $row['name'], $row['colour']),
|
||||
'NAME_FULL' => get_username_string('full', $id, $row['name'], $row['colour']),
|
||||
));
|
||||
}
|
||||
else
|
||||
{
|
||||
$tpl_ary = array_merge($tpl_ary, array(
|
||||
'U_VIEW' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $id),
|
||||
));
|
||||
}
|
||||
|
||||
$template->assign_block_vars($check_type . '_recipient', $tpl_ary);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user