1 files changed, 45 insertions, 3 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index fc40dd65bb..1f59019245 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1609,7 +1609,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		$user_cache[$poster_id]['user_type'] != USER_IGNORE &&
 
 		// They must not be deactivated by the administrator
-		($user_cache[$poster_id]['user_type'] != USER_INACTIVE && $user_cache[$poster_id]['user_inactive_reason'] == INACTIVE_MANUAL) &&
+		($user_cache[$poster_id]['user_type'] != USER_INACTIVE || $user_cache[$poster_id]['user_inactive_reason'] != INACTIVE_MANUAL) &&
 
 		// They must be able to read PMs
 		in_array($poster_id, $can_receive_pm_list) &&
@@ -1618,9 +1618,16 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		!in_array($poster_id, $permanently_banned_users) &&
 
 		// They must allow users to contact via PM
-		(($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) || $data['user_allow_pm'])
+		(($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) || $user_cache[$poster_id]['allow_pm'])
 	);
 
+	$u_pm = '';
+
+	if ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && $can_receive_pm)
+	{
+		$u_pm = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;action=quotepost&amp;p=' . $row['post_id']);
+	}
+
 	//
 	$post_row = array(
 		'POST_AUTHOR_FULL'		=> ($poster_id != ANONYMOUS) ? $user_cache[$poster_id]['author_full'] : get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']),
@@ -1660,7 +1667,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'U_DELETE'			=> ($delete_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
 
 		'U_SEARCH'		=> $user_cache[$poster_id]['search'],
-		'U_PM'			=> ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && $can_receive_pm) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;action=quotepost&amp;p=' . $row['post_id']) : '',
+		'U_PM'			=> $u_pm,
 		'U_EMAIL'		=> $user_cache[$poster_id]['email'],
 		'U_JABBER'		=> $user_cache[$poster_id]['jabber'],
 
@@ -1744,11 +1751,46 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 	// Dump vars into template
 	$template->assign_block_vars('postrow', $post_row);
 
+	$contact_fields = array(
+		array(
+			'ID'		=> 'pm',
+			'NAME' 		=> $user->lang['PRIVATE_MESSAGES'],
+			'U_CONTACT'	=> $u_pm,
+		),
+		array(
+			'ID'		=> 'email',
+			'NAME'		=> $user->lang['SEND_EMAIL'],
+			'U_CONTACT'	=> $user_cache[$poster_id]['email'],
+		),
+		array(
+			'ID'		=> 'jabber',
+			'NAME'		=> $user->lang['JABBER'],
+			'U_CONTACT'	=> $user_cache[$poster_id]['jabber'],
+		),
+	);
+
+	foreach ($contact_fields as $field)
+	{
+		if ($field['U_CONTACT'])
+		{
+			$template->assign_block_vars('postrow.contact', $field);
+		}
+	}
+
 	if (!empty($cp_row['blockrow']))
 	{
 		foreach ($cp_row['blockrow'] as $field_data)
 		{
 			$template->assign_block_vars('postrow.custom_fields', $field_data);
+
+			if ($field_data['S_PROFILE_CONTACT'])
+			{
+				$template->assign_block_vars('postrow.contact', array(
+					'ID'		=> $field_data['PROFILE_FIELD_IDENT'],
+					'NAME'		=> $field_data['PROFILE_FIELD_NAME'],
+					'U_CONTACT'	=> $field_data['PROFILE_FIELD_CONTACT'],
+				));
+			}
 		}
 	}