mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

checking in some fixes... also added "previous/next pm in history" links to prosilvers private message view; dhn, you may want to have a look at the placement. :)

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7322 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-04-10 20:50:14 +00:00
parent 067f80eccc
commit e70cea16b9
18 changed files with 54 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_pm_compose.php
View File

@@ -556,7 +556,7 @@ function compose_pm($id, $mode, $action)
'from_user_id' => $user->data['user_id'],
'from_user_ip' => $user->data['user_ip'],
'from_username' => $user->data['username'],
'reply_from_root_level' => (isset($root_level)) ? (int) $root_level : 0,
'reply_from_root_level' => (isset($post['root_level'])) ? (int) $post['root_level'] : 0,
'reply_from_msg_id' => (int) $msg_id,
'icon_id' => (int) $icon_id,
'enable_sig' => (bool) $enable_sig,

7
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@@ -250,9 +250,7 @@ function message_history($msg_id, $user_id, $message_row, $folder)
{
$sql .= " AND (p.root_level = " . $message_row['root_level'] . ' OR p.msg_id = ' . $message_row['root_level'] . ')';
}
$sql .= ' ORDER BY p.message_time ';
$sort_dir = (!empty($user->data['user_sortby_dir'])) ? $user->data['user_sortby_dir'] : 'd';
$sql .= ($sort_dir == 'd') ? 'ASC' : 'DESC';
$sql .= ' ORDER BY p.message_time DESC';
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
@@ -267,7 +265,6 @@ function message_history($msg_id, $user_id, $message_row, $folder)
$bbcode_bitfield = '';
$folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm') . '&folder=';
$title = ($sort_dir == 'd') ? $row['message_subject'] : '';
do
{
$folder_id = (int) $row['folder_id'];
@@ -287,7 +284,7 @@ function message_history($msg_id, $user_id, $message_row, $folder)
while ($row = $db->sql_fetchrow($result));
$db->sql_freeresult($result);
$title = ($sort_dir == 'a') ? $row['message_subject'] : $title;
$title = $row['message_subject'];
if (sizeof($rowset) == 1)
{