diff options
| author | Tom Beddard <subblue@users.sourceforge.net> | 2005-12-30 21:04:47 +0000 |
|---|---|---|
| committer | Tom Beddard <subblue@users.sourceforge.net> | 2005-12-30 21:04:47 +0000 |
| commit | 369d6b730329a8a028b6e369c49d49f12d3fbf01 (patch) | |
| tree | 72987a268d0e1cba7b16f5c93bb8eddb7d460ea5 | |
| parent | 82aed60ac0a85d46b440ada7bbb707512f239244 (diff) | |
| download | forums-369d6b730329a8a028b6e369c49d49f12d3fbf01.tar forums-369d6b730329a8a028b6e369c49d49f12d3fbf01.tar.gz forums-369d6b730329a8a028b6e369c49d49f12d3fbf01.tar.bz2 forums-369d6b730329a8a028b6e369c49d49f12d3fbf01.tar.xz forums-369d6b730329a8a028b6e369c49d49f12d3fbf01.zip | |
Fixed new PM link and added online status flag
git-svn-id: file:///svn/phpbb/trunk@5410 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index 1b97f64ff1..def7a76b93 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -288,7 +288,7 @@ function get_pm_from($folder_id, $folder, $user_id, $url, $type = 'folder') 'S_SELECT_SORT_DAYS' => $s_limit_days, 'S_TOPIC_ICONS' => ($config['enable_pm_icons']) ? true : false, - 'U_POST_NEW_TOPIC' => ($auth->acl_get('u_sendpm')) ? "$url&i=compose&action=post" : '', + 'U_POST_NEW_TOPIC' => ($auth->acl_get('u_sendpm')) ? "$url&i=pm&mode=compose" : '', 'S_PM_ACTION' => "$url&i=pm&mode=view&action=view_folder&f=$folder_id") ); diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 3976e13764..1bb57845f8 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -170,6 +170,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'AUTHOR_FROM' => (!empty($user_info['user_from'])) ? $user_info['user_from'] : '', 'ONLINE_IMG' => (!$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? $user->img('btn_online', $user->lang['ONLINE']) : $user->img('btn_offline', $user->lang['OFFLINE'])), + 'S_ONLINE' => (!$config['load_onlinetrack']) ? false : ((isset($user_info['online']) && $user_info['online']) ? true : false), 'DELETE_IMG' => $user->img('btn_delete', $user->lang['DELETE_MESSAGE']), 'INFO_IMG' => $user->img('btn_info', $user->lang['VIEW_PM_INFO']), 'REPORT_IMG' => $user->img('btn_report', $user->lang['REPORT_PM']), @@ -343,7 +344,7 @@ function message_history($msg_id, $user_id, $message_row, $folder) 'FOLDER' => implode(', ', $row['folder']), 'S_CURRENT_MSG' => ($row['msg_id'] == $msg_id), - + 'U_MSG_ID' => $row['msg_id'], 'U_VIEW_MESSAGE'=> "$url&f=$folder_id&p=" . $row['msg_id'], 'U_AUTHOR_PROFILE' => "{$phpbb_root_path}memberlist.$phpEx$SID&mode=viewprofile&u=$author_id", |