From 26eb848c36688e459e5dfc46cdc68d87ed2bda0c Mon Sep 17 00:00:00 2001
From: Gina Haeussge <gina@foosel.net>
Date: Sat, 2 Oct 2010 18:04:09 +0200
Subject: FS#1353: Only highlight isolated occurences of search term, not those
 where it's part of another term. Word boundaries are now respected.

---
 inc/html.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'inc/html.php')

diff --git a/inc/html.php b/inc/html.php
index add559971..e1478b0a8 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -285,13 +285,20 @@ function html_draft(){
  */
 function html_hilight($html,$phrases){
     $phrases = array_filter((array) $phrases);
-    $regex = join('|',array_map('preg_quote_cb',$phrases));
+    $regex = join('|',array_map('_html_hilight_re_preprocess', array_map('preg_quote_cb',$phrases)));
 
     if ($regex === '') return $html;
     $html = preg_replace_callback("/((<[^>]*)|$regex)/ui",'html_hilight_callback',$html);
     return $html;
 }
 
+/**
+ * Wraps a search term in regex boundary checks.
+ */
+function _html_hilight_re_preprocess($term) {
+    return '\b'.$term.'\b';
+}
+
 /**
  * Callback used by html_hilight()
  *
-- 
cgit v1.2.3


From 2237b4fa4c84beb06a92308a19e45027e2bdc131 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 3 Oct 2010 12:53:41 +0200
Subject: correctly handle highlighting of partial searches FS#1353

---
 inc/html.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'inc/html.php')

diff --git a/inc/html.php b/inc/html.php
index e1478b0a8..968a63e4e 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -285,20 +285,13 @@ function html_draft(){
  */
 function html_hilight($html,$phrases){
     $phrases = array_filter((array) $phrases);
-    $regex = join('|',array_map('_html_hilight_re_preprocess', array_map('preg_quote_cb',$phrases)));
+    $regex = join('|',array_map('ft_snippet_re_preprocess', array_map('preg_quote_cb',$phrases)));
 
     if ($regex === '') return $html;
     $html = preg_replace_callback("/((<[^>]*)|$regex)/ui",'html_hilight_callback',$html);
     return $html;
 }
 
-/**
- * Wraps a search term in regex boundary checks.
- */
-function _html_hilight_re_preprocess($term) {
-    return '\b'.$term.'\b';
-}
-
 /**
  * Callback used by html_hilight()
  *
-- 
cgit v1.2.3