diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-10-13 17:07:39 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-10-13 17:07:39 +0200 |
| commit | d5cd49f276afa205809c905c18abe71cf4dd7fc0 (patch) | |
| tree | a986300105f22b5c2fe8c4ea6b921ec7e41a64bb /phpBB/includes/ucp | |
| parent | 9fbe4e34abdc7dc032ceee6ec4b88937c2f24eb8 (diff) | |
| parent | 4c1bde350aa07358ec4177bcf0d66afb6931e604 (diff) | |
| download | forums-d5cd49f276afa205809c905c18abe71cf4dd7fc0.tar forums-d5cd49f276afa205809c905c18abe71cf4dd7fc0.tar.gz forums-d5cd49f276afa205809c905c18abe71cf4dd7fc0.tar.bz2 forums-d5cd49f276afa205809c905c18abe71cf4dd7fc0.tar.xz forums-d5cd49f276afa205809c905c18abe71cf4dd7fc0.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10304] Fix URL for ICQ while view private messages
Diffstat (limited to 'phpBB/includes/ucp')
| -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 8b288f5de1..c9451bd202 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -239,7 +239,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' . 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) : '', |