aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-10-26 14:20:33 +0100
committerAndreas Fischer <bantu@phpbb.com>2014-10-26 14:20:33 +0100
commit69cf5782d40c5e5746c93a768868b594a30bf157 (patch)
treec2716acc426dcc9951f277263c9ca354ba42859f /phpBB/includes/ucp
parent5441a4ea132c2cc6e86e1446c48e276eeb728970 (diff)
parent79274e904c19f119966ed027718db39104175bab (diff)
downloadforums-69cf5782d40c5e5746c93a768868b594a30bf157.tar
forums-69cf5782d40c5e5746c93a768868b594a30bf157.tar.gz
forums-69cf5782d40c5e5746c93a768868b594a30bf157.tar.bz2
forums-69cf5782d40c5e5746c93a768868b594a30bf157.tar.xz
forums-69cf5782d40c5e5746c93a768868b594a30bf157.zip
Merge pull request #3054 from Senky/ticket/13193
[ticket/13193] Post count in PMs not a link * Senky/ticket/13193: [ticket/13193] Swap ternary condition members [ticket/13193] Make template more readable [ticket/13193] Add load_search config check [ticket/13193] Add link to post count in PMs
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 2f34fd64a5..b2dc962f57 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -213,6 +213,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'AUTHOR_AVATAR' => (isset($user_info['avatar'])) ? $user_info['avatar'] : '',
'AUTHOR_JOINED' => $user->format_date($user_info['user_regdate']),
'AUTHOR_POSTS' => (int) $user_info['user_posts'],
+ 'U_AUTHOR_POSTS' => ($config['load_search'] && $auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$author_id&amp;sr=posts") : '',
'CONTACT_USER' => $user->lang('CONTACT_USER', get_username_string('username', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username'])),
'ONLINE_IMG' => (!$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? $user->img('icon_user_online', $user->lang['ONLINE']) : $user->img('icon_user_offline', $user->lang['OFFLINE'])),