Fixing bug 341846, Don't encode fwd-slash when doing keyword substitution. patch by froodian <stridey@gmail.com>, r=chris lawson, hwaara, sr=pink.
git-svn-id: svn://10.0.0.236/trunk@201821 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -1020,7 +1020,7 @@ static int BookmarkItemSort(id firstItem, id secondItem, void* context)
|
||||
(CFStringRef)searchString,
|
||||
NULL,
|
||||
// legal URL characters that should be encoded in search terms
|
||||
CFSTR(";/?:@&=+$,"),
|
||||
CFSTR(";?:@&=+$,"),
|
||||
kCFStringEncodingUTF8) autorelease];
|
||||
NSString* resultString = [NSString stringWithFormat:@"%@%@%@",
|
||||
[url substringToIndex:matchRange.location],
|
||||
|
||||
@@ -2166,7 +2166,7 @@ enum BWCOpenDest {
|
||||
|
||||
// Escape the search string so the user can search for strings with
|
||||
// special characters ("&", "+", etc.) List from RFC2396.
|
||||
NSString *escapedSearchString = (NSString *) CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)searchString, NULL, CFSTR(";/?:@&=+$,"), kCFStringEncodingUTF8);
|
||||
NSString *escapedSearchString = (NSString *) CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)searchString, NULL, CFSTR(";?:@&=+$,"), kCFStringEncodingUTF8);
|
||||
|
||||
// replace the conversion specifiers (%d, %s) in the search string
|
||||
[self transformFormatString:searchURL domain:aDomain search:escapedSearchString];
|
||||
|
||||
Reference in New Issue
Block a user