amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-21 03:15:25 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog.

Browse Source 
Monotone-Parent: 5be507aec21eb7c99a5024135035b80901450a40
Monotone-Revision: 43302bf5a2ca20f32477d5cd984a6f08aeb0149b

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-10-13T10:53:16
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-10-13 10:53:16 +00:00
parent ecd08fd79b
commit 43b48bd3db
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2011-10-14 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/SOGo/NSString+Utilities.m (-_rangeOfURLInRange:):
fixed handling of brackets (inequality signs <>).
2011-10-14 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/SOGo/SOGoGCSFolder.m (setRoles:forUser:..)
SoObjects/SOGo/NSString+Utilities.m
+11
View File
@@ -142,6 +142,12 @@ static int cssEscapingCount;
[self characterAtIndex: start]])
start--;
start++;
// In [UIxMailPartTextViewer flatContentAsString], we first escape HTML entities and then
// add URLs. Therefore, the brackets (inequality signs <>) have been encoded at this point.
if ([[self substringWithRange: NSMakeRange (start, 4)] compare: @"&lt;"] == NSOrderedSame)
start += 4;
length = [self length] - start;
workRange = NSMakeRange (start, length);
workRange = [self rangeOfCharacterFromSet: urlAfterEndingChars
@@ -154,6 +160,11 @@ static int cssEscapingCount;
[self characterAtIndex: (start + length - 1)]])
length--;
// Remove trailing ">"
if (([self length] >= start + length + 1)
&& [[self substringWithRange: NSMakeRange (start, length + 1)] hasSuffix: @"&gt;"])
length -= 3;
return NSMakeRange (start, length);
}