adium-1.4 2718:dce9e8066777: Only add color tags if a style supp...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/dce9e8066777
revision:	2718:dce9e8066777
author:		Zachary West <zacw at adium.im>
date:		Sat Oct 31 22:35:08 2009 -0400

Only add color tags if a style supports colors. Fixes #13286.

diffs (12 lines):

diff -r 50f1ae85f841 -r dce9e8066777 Plugins/WebKit Message View/AIWebkitMessageViewStyle.m
--- a/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m	Sat Oct 31 19:02:43 2009 -0400
+++ b/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m	Sat Oct 31 22:35:08 2009 -0400
@@ -717,7 +717,7 @@
 	NSString		*htmlEncodedMessage = [AIHTMLDecoder encodeHTML:[content message]
 															headers:NO 
 														   fontTags:showIncomingFonts
-												 includingColorTags:showIncomingColors
+												 includingColorTags:(allowsColors && showIncomingColors)
 													  closeFontTags:YES
 														  styleTags:YES
 										 closeStyleTagsOnFontChange:YES