diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-05 18:44:39 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-05 18:44:39 -0600 |
| commit | 4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f (patch) | |
| tree | c7828ddf135f2ad66570554f1369cf70483ddefa /phpBB/includes/ucp/ucp_pm_viewmessage.php | |
| parent | 40c582688b7eb4fd5e48d06c4f2fd4c044012b08 (diff) | |
| parent | d380cdec02f2d5a6d6b4756570031af87590905a (diff) | |
| download | forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar.gz forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar.bz2 forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar.xz forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.zip | |
Merge pull request #2088 from nickvergessen/ticket/12236
Ticket/12236 Convert AOL and Yahoo to custom profile fields
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_viewmessage.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 594415ffc0..b68389cba7 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -209,8 +209,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'MESSAGE_ID' => $message_row['msg_id'], 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $author_id) : '', - 'U_AIM' => ($user_info['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=aim&u=' . $author_id) : '', - 'U_YIM' => ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($user_info['user_yim']) . '&.src=pg' : '', 'U_JABBER' => ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $author_id) : '', 'U_DELETE' => ($auth->acl_get('u_pm_delete')) ? "$url&mode=compose&action=delete&f=$folder_id&p=" . $message_row['msg_id'] : '', |