diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-10-26 14:20:34 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-10-26 14:20:34 +0100 |
| commit | e4277525a07bb83dd825c0232c4937033cece9aa (patch) | |
| tree | 5eaef7ce03f8e5a9eb127bc640d45e9a28a342a6 /phpBB/includes/ucp | |
| parent | 5b42bcfe629093ef09436fdbb5ea600793cf8f55 (diff) | |
| parent | 69cf5782d40c5e5746c93a768868b594a30bf157 (diff) | |
| download | forums-e4277525a07bb83dd825c0232c4937033cece9aa.tar forums-e4277525a07bb83dd825c0232c4937033cece9aa.tar.gz forums-e4277525a07bb83dd825c0232c4937033cece9aa.tar.bz2 forums-e4277525a07bb83dd825c0232c4937033cece9aa.tar.xz forums-e4277525a07bb83dd825c0232c4937033cece9aa.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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.php | 1 |
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&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'])), |