aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJakub Senko <jakubsenko@gmail.com>2014-10-21 22:53:59 +0200
committerJakub Senko <jakubsenko@gmail.com>2014-10-21 22:53:59 +0200
commit0dcfcf585422f718ae3ec7368aa61d105b0402f7 (patch)
tree1d613beffc14cbf7569ca78b10e163fa59c6bf08 /phpBB/includes
parent92f077a4e98083ab8af38f91fa176399724d46b8 (diff)
downloadforums-0dcfcf585422f718ae3ec7368aa61d105b0402f7.tar
forums-0dcfcf585422f718ae3ec7368aa61d105b0402f7.tar.gz
forums-0dcfcf585422f718ae3ec7368aa61d105b0402f7.tar.bz2
forums-0dcfcf585422f718ae3ec7368aa61d105b0402f7.tar.xz
forums-0dcfcf585422f718ae3ec7368aa61d105b0402f7.zip
[ticket/13193] Add load_search config check
PHPBB3-13193
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php2
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 81072ee081..68973e1049 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -213,7 +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' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$author_id&amp;sr=posts") : '',
+ 'U_AUTHOR_POSTS' => ($auth->acl_get('u_search') && $config['load_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'])),