Merge pull request #537 from Oldiesmann/release-2.1

More PM-related bugfixes

Sources/PersonalMessage.php

@@ -809,8 +809,8 @@ function MessageFolder()
 
 			// Seperate query for these bits!
 			$subjects_request = $smcFunc['db_query']('', '
-				SELECT pm.id_pm, pm.subject, pm.id_member_from, pm.msgtime, IFNULL(mem.real_name, pm.from_name) AS from_name,
-					IFNULL(mem.id_member, 0) AS not_guest
+				SELECT pm.id_pm, pm.subject, IFNULL(pm.id_member_from, 0) AS not_guest, pm.msgtime, IFNULL(mem.real_name, pm.from_name) AS from_name,
+					mem.id_member
 				FROM {db_prefix}personal_messages AS pm
 					LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = pm.id_member_from)
 				WHERE pm.id_pm IN ({array_int:pm_list})

Themes/default/PersonalMessage.template.php

@@ -179,9 +179,14 @@ function template_folder()
 				<li>
 					<h4>
 						<a id="msg', $message['id'], '"></a>';
-		// Show a link to the member's profile.
+						
+		
+		// Show a link to the member's profile (but only if the sender isn't a guest).
+		if (!$message['member']['is_guest'])
+			echo '
+						<a href="', $scripturl, '?action=profile;u=', $message['member']['id'], '">';
+		
 		echo '
-						<a href="', $scripturl, '?action=profile;u=', $message['member']['id'], '">
 							<span style="padding: 6px; display: block;">', $message['member']['name'], '</span>';
 
 		// Show avatars, images, etc.?
@@ -190,8 +195,11 @@ function template_folder()
 
 							', $message['member']['avatar']['image'], '';
 
+		if (!$message['member']['is_guest'])
 			echo '
-						</a>
+						</a>';
+
+		echo '
 					</h4>
 					<ul class="smalltext" id="msg_', $message['id'], '_extra_info">';