diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-04-05 00:31:42 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-04-05 00:31:42 +0200 |
| commit | 7074d19c4087fab0e81a31bd806724d7eac7ef87 (patch) | |
| tree | f41c235714daede352248fa05ba45578ac9d2f33 /phpBB/includes | |
| parent | ebc338b9f3b75b758f55dc5a9a2300e8c154c74f (diff) | |
| parent | df622a1fab35f4b654f48237799d2fa4164dc3be (diff) | |
| download | forums-7074d19c4087fab0e81a31bd806724d7eac7ef87.tar forums-7074d19c4087fab0e81a31bd806724d7eac7ef87.tar.gz forums-7074d19c4087fab0e81a31bd806724d7eac7ef87.tar.bz2 forums-7074d19c4087fab0e81a31bd806724d7eac7ef87.tar.xz forums-7074d19c4087fab0e81a31bd806724d7eac7ef87.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.php
[ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index bee2ea95dd..74a32a68c9 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -208,7 +208,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) '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_WWW' => (!empty($user_info['user_website'])) ? $user_info['user_website'] : '', - 'U_ICQ' => ($user_info['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . urlencode($user_info['user_icq']) : '', + 'U_ICQ' => ($user_info['user_icq']) ? 'http://www.icq.com/people' . urlencode($user_info['user_icq']) . '/' : '', '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_MSN' => ($user_info['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=msnm&u=' . $author_id) : '', |