Changeset 3756

Show
Ignore:
Timestamp:
10/14/07 17:20:36 (10 months ago)
Author:
timothy
Message:

A more correct fix for #219 and #1118.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Panels/JVChatRoomPanel.m

    r3752 r3756  
    368368                [escapedName escapeCharactersInSet:escapeSet]; 
    369369 
    370                 NSString *pattern = [[NSString alloc] initWithFormat:@"(?:^|\\s)%@(?:$|\\s)", escapedName]; 
     370                NSString *pattern = [[NSString alloc] initWithFormat:@"(?<=^|\\s|[^\\w])%@(?=$|\\s|[^\\w])", escapedName]; 
    371371                AGRegex *regex = [AGRegex regexWithPattern:pattern options:AGRegexCaseInsensitive]; 
    372372 

  • trunk/Panels/JVDirectChatPanel.m

    r3755 r3756  
    813813                        } else { 
    814814                                name = [name stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"\"'"]]; 
    815                                 NSString *pattern = [NSString stringWithFormat:@"(?:^|\\s)%@(?:$|\\s)", [name stringByEscapingCharactersInSet:escapeSet]]; 
     815                                NSString *pattern = [NSString stringWithFormat:@"(?<=^|\\s|[^\\w])%@(?=$|\\s|[^\\w])", [name stringByEscapingCharactersInSet:escapeSet]]; 
    816816                                regex = [AGRegex regexWithPattern:pattern options:AGRegexCaseInsensitive]; 
    817817                        }