# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1245077320 0
# Node ID e4fbc191a598685159a919271d355da243459d9d
# Parent  4d1dd45e6549a86ac6bc4988d50f3a3001fd6296
Update to v1.1.0:
 * Update instructions (prosilver) to display both ranks for viewing PMs

no-open-ticket

diff -r 4d1dd45e6549 -r e4fbc191a598 Install.xml
--- a/Install.xml	Mon Jun 15 12:41:04 2009 +0000
+++ b/Install.xml	Mon Jun 15 14:48:40 2009 +0000
@@ -39,6 +39,7 @@
 				<rev-version>1.1.0</rev-version>
 				<changelog lang="en-gb">
 					<change>Add: Add config value for Memberlist that also fixes the situation where only users with special ranks show ranks in the members list</change>
+					<change>Add: Add code and template to add both ranks when viewing PMs</change>
 					<change>Change: Update documentation on get_user_additional_rank to make it different to get_user_rank</change>
 				</changelog>
 			</entry>
@@ -131,6 +132,32 @@
 				</action>
 			</edit>
 		</open>
+		<open src="includes/ucp/ucp_pm_viewmessage.php">
+			<edit>
+				<find><![CDATA[		'RANK_TITLE'		=> $user_info['rank_title'],
+		'RANK_IMG'			=> $user_info['rank_image'],]]></find>
+				<action type="after-add"><![CDATA[		'EXTRA_RANK_TITLE'		=> $user_info['extra_rank_title'],
+		'EXTRA_RANK_IMG'			=> $user_info['extra_rank_img'],]]></action>
+			</edit>
+			<edit>
+				<find><![CDATA[	get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']);]]></find>
+				<action type="after-add"><![CDATA[	$user_row['extra_rank_title'] = $user_row['extra_rank_img'] = $user_row['extra_rank_img_src'] = '';
+
+	if (defined('SHOW_SPECIAL_AS_EXTRA') && SHOW_SPECIAL_AS_EXTRA)
+	{
+		$user_row['extra_rank_title'] = $user_row['rank_title'];
+		$user_row['extra_rank_img'] = $user_row['rank_image'];
+		$user_row['extra_rank_img_src'] = $user_row['rank_img_src'];
+		$user_row['rank_title'] = $user_row['rank_img'] = $user_row['rank_img_src'] = '';
+
+		get_user_additional_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']);
+	}
+	else
+	{
+		get_user_additional_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['extra_rank_title'], $user_row['extra_rank_img'], $user_row['extra_rank_img_src']);
+	}]]></action>
+			</edit>
+		</open>
 		<open src="memberlist.php">
 			<edit>
 				<find><![CDATA[				if (isset($cp_row['row']) && sizeof($cp_row['row']))]]></find>
@@ -186,6 +213,13 @@
 			<!-- IF EXTRA_RANK_IMG --><dt>&nbsp;</dt> <dd>{EXTRA_RANK_IMG}</dd><!-- ENDIF -->]]></action>
 			</edit>
 		</open>
+		<open src="styles/prosilver/template/ucp_pm_viewmessage.html">
+			<edit>
+				<find><![CDATA[		<!-- IF RANK_IMG --><dd>{RANK_IMG}</dd><!-- ENDIF -->]]></find>
+				<action type="after-add"><![CDATA[		<!-- IF EXTRA_RANK_TITLE --><dd>{EXTRA_RANK_TITLE}</dd><!-- ENDIF -->
+		<!-- IF EXTRA_RANK_IMG --><dd>{EXTRA_RANK_IMG}</dd><!-- ENDIF -->]]></action>
+			</edit>
+		</open>
 		<open src="styles/prosilver/template/viewtopic_body.html">
 			<edit>
 				<find><![CDATA[			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd>{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF -->]]></find>