adium-1.4 2578:c5b0c0b0c141: Cherry-picked 3855f70905bd from adium:
commits at adium.im
commits at adium.im
Thu Aug 13 20:32:24 UTC 2009
details: http://hg.adium.im/adium-1.4/rev/c5b0c0b0c141
revision: 2578:c5b0c0b0c141
author: terminus at Aleph.local
date: Tue Aug 11 23:58:06 2009 +0400
Cherry-picked 3855f70905bd from adium:
Corrected handling of &# construction (#8141)
diffs (28 lines):
diff -r 19c704d73e7f -r c5b0c0b0c141 Frameworks/Adium Framework/Source/AIHTMLDecoder.m
--- a/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Wed Aug 12 13:32:55 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Tue Aug 11 23:58:06 2009 +0400
@@ -432,10 +432,10 @@
linkString = fixedLinkString;
}
- [string appendString:linkString];
+ [string appendString:[linkString stringByEscapingForXMLWithEntities:nil]];
if (!thingsToInclude.simpleTagsOnly) {
[string appendString:@"\" title=\""];
- [string appendString:linkString];
+ [string appendString:[linkString stringByEscapingForXMLWithEntities:nil]];
}
NSString *classString = [attributes objectForKey:AIElementClassAttributeName];
diff -r 19c704d73e7f -r c5b0c0b0c141 Frameworks/Adium Framework/Source/AIXMLElement.m
--- a/Frameworks/Adium Framework/Source/AIXMLElement.m Wed Aug 12 13:32:55 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIXMLElement.m Tue Aug 11 23:58:06 2009 +0400
@@ -230,7 +230,7 @@
} else if ([value respondsToSelector:@selector(absoluteString)]) {
value = [(NSURL *)value absoluteString];
}
- [string appendFormat:@" %@=%@", key, [self quotedXMLAttributeValueStringForString:value]];
+ [string appendFormat:@" %@=\"%@\"", key, value];
}
}
if ((![contents count]) && (selfCloses)) {
More information about the commits
mailing list