Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 10:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mark%moxienet.com 2005-12-01 22:16:04 +00:00
parent 61f53c8997
commit 389ab1d43b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
camino/src/bookmarks/BookmarkManager.mm
View File

@ -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="">&lt;Menu Spacer&gt; (bug 309008)
if ([[tokenString substringFromIndex:([tokenScanner scanLocation]+8)] isEqualToString:@"&lt;Menu Spacer&gt;"]) {
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];