Fixed WebGUI::Asset::Wobject::Search::view() so HTML highlighting not broken by search phrase with unmatched char pairs

pbmarklf · pbmarklf · commit 7a6ee77a0606 · 2012-07-02T17:03:58.000-04:00
Fixed WebGUI::Asset::Wobject::Search::view() so HTML highlighting will not
be broken by a search phrase with unmatched char pairs like '()', '{}',
and '[]' (the HTML highlighter uses a regex internally for matching words
in the search phrase). Also fixed so ':' in the search phrase does not
confuse the HTML highlighter.
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.10.25
+ - fixed: #12373: Asset::Wobject::Search::view() so HTML highlite not broken by search phrase with unmatched char pairs
  - fixed: if user1 adds user2 as a friend, user2 doesn't see user1 as a friend
  - fixed: data sync bug in WebGUI::User::friends
  - added: give WebGUI::PseudoRequest a hostname method
diff --git a/lib/WebGUI/Asset/Wobject/Search.pm b/lib/WebGUI/Asset/Wobject/Search.pm
@@ -199,7 +199,7 @@ sub view {
 		$search->search(\%rules);
 		
         #Instantiate the highlighter
-        my @words     = grep { $_ ne '' } map { tr/+?*//d; $_; } split(/\s+/,$keywords);
+        my @words     = grep { $_ ne '' } map { tr/+?*:()[]{}//d; $_; } split(/\s+/,$keywords);
         my @wildcards = map { "%" } @words;
         my $hl = HTML::Highlight->new(
             words     => \@words,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`7.10.25`
	`2`	`+ - fixed: #12373: Asset::Wobject::Search::view() so HTML highlite not broken by search phrase with unmatched char pairs`
`2`	`3`	`- fixed: if user1 adds user2 as a friend, user2 doesn't see user1 as a friend`
`3`	`4`	`- fixed: data sync bug in WebGUI::User::friends`
`4`	`5`	`- added: give WebGUI::PseudoRequest a hostname method`