mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-24 10:45:42 +00:00
Bug 309008, menu spacer imported as editable bookmark with url of ". Don't do that. Patch by Chris Lawson <bugzilla@chrislawson.net>. Camino-only-npotdb. r=pink sr=smfr
This commit is contained in:
parent
61f53c8997
commit
389ab1d43b
@ -1383,10 +1383,18 @@ static BookmarkManager* gBookmarkManager = nil;
|
||||
}
|
||||
else if ([tokenTag isEqualToString:@"<A "]) {
|
||||
// adding a new bookmark to end of currentArray.
|
||||
[fileScanner scanUpToString:@"</A>" intoString:&tokenString];
|
||||
[fileScanner scanUpToString:@"</A>" intoString:&tokenString]; // fileScanner contains <A HREF="[URL]">[TITLE]</A>
|
||||
tokenScanner = [[NSScanner alloc] initWithString:tokenString];
|
||||
[tokenScanner scanUpToString:@"href=\"" intoString:NULL];
|
||||
// might be a menu spacer. check to make sure.
|
||||
[tokenScanner scanUpToString:@"href=\"" intoString:nil]; // tokenScanner now contains HREF="[URL]">[TITLE]
|
||||
// check for a menu spacer, which will look like this: HREF=""><Menu Spacer> (bug 309008)
|
||||
if ([[tokenString substringFromIndex:([tokenScanner scanLocation]+8)] isEqualToString:@"<Menu Spacer>"]) {
|
||||
currentItem = [currentArray addBookmark];
|
||||
[(Bookmark *)currentItem setIsSeparator:YES];
|
||||
[tokenScanner release];
|
||||
[tokenTag release];
|
||||
[fileScanner setScanLocation:([fileScanner scanLocation]+1)];
|
||||
continue;
|
||||
}
|
||||
if (![tokenScanner isAtEnd]) {
|
||||
[tokenScanner setScanLocation:([tokenScanner scanLocation]+6)];
|
||||
[tokenScanner scanUpToString:@"\"" intoString:&tempItem];
|
||||
|
Loading…
Reference in New Issue
Block a user