adium 2632:4229267e69e1: Cheery picked from adium-1.4 at 07e07f9788...

commits at adium.im commits at adium.im
Wed Aug 26 17:15:37 UTC 2009


details:	http://hg.adium.im/adium/rev/4229267e69e1
revision:	2632:4229267e69e1
author:		Stephen Holt <sholt at adium.im>
date:		Wed Aug 26 13:17:35 2009 -0400

Cheery picked from adium-1.4 at 07e07f9788a6: Undo the part of [3855f70905bd]: It caused strings to be incorrectly escaped and causing our XML parsing to break.  Rather, escape hash-symbols when parsing in XML data as not to confuse AIHTMLDecoder.

diffs (27 lines):

diff -r 1c0d93cf8930 -r 4229267e69e1 Frameworks/Adium Framework/Source/AIXMLElement.m
--- a/Frameworks/Adium Framework/Source/AIXMLElement.m	Wed Aug 26 11:33:51 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIXMLElement.m	Wed Aug 26 13:17:35 2009 -0400
@@ -230,7 +230,7 @@
 			} else if ([value respondsToSelector:@selector(absoluteString)]) {
 				value = [(NSURL *)value absoluteString];
 			}
-			[string appendFormat:@" %@=\"%@\"", key, value];
+			[string appendFormat:@" %@=%@", key, [self quotedXMLAttributeValueStringForString:value]];
 		}
 	}
 	if ((![contents count]) && (selfCloses)) {
diff -r 1c0d93cf8930 -r 4229267e69e1 Source/AIXMLChatlogConverter.m
--- a/Source/AIXMLChatlogConverter.m	Wed Aug 26 11:33:51 2009 -0400
+++ b/Source/AIXMLChatlogConverter.m	Wed Aug 26 13:17:35 2009 -0400
@@ -260,6 +260,11 @@
 													withString:@"&"
 													   options:NSLiteralSearch
 														 range:NSMakeRange(0, [mutableMessage length])];
+					// Escape anchor tags
+					[mutableMessage replaceOccurrencesOfString:@"#"
+													withString:@"&#x23;"
+													   options:NSLiteralSearch
+														 range:NSMakeRange(0, [mutableMessage length])];
 					message = [mutableMessage autorelease];
 				}
 				NSString *shownSender = (senderAlias ? senderAlias : sender);



More information about the commits mailing list