Merge branch 'master' of github.com:splitbrain/dokuwiki

2 files changed, 16 insertions, 2 deletions

diff --git a/inc/fulltext.php b/inc/fulltext.php
index e90205e9c..7dae183c8 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -313,7 +313,7 @@ function ft_snippet($id,$highlight){
         $len = utf8_strlen($text);
 
         // build a regexp from the phrases to highlight
-        $re1 = '('.join('|',array_map('preg_quote_cb',array_filter((array) $highlight))).')';
+        $re1 = '('.join('|',array_map('_ft_snippet_re_preprocess', array_map('preg_quote_cb',array_filter((array) $highlight)))).')';
         $re2 = "$re1.{0,75}(?!\\1)$re1";
         $re3 = "$re1.{0,45}(?!\\1)$re1.{0,45}(?!\\1)(?!\\2)$re1";
 
@@ -387,6 +387,13 @@ function ft_snippet($id,$highlight){
 }
 
 /**
+ * Wraps a search term in regex boundary checks.
+ */
+function _ft_snippet_re_preprocess($term) {
+    return '\b'.$term.'\b';
+}
+
+/**
  * Combine found documents and sum up their scores
  *
  * This function is used to combine searched words with a logical
diff --git a/inc/html.php b/inc/html.php
index add559971..e1478b0a8 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -285,7 +285,7 @@ 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);
@@ -293,6 +293,13 @@ function html_hilight($html,$phrases){
 }
 
 /**
+ * Wraps a search term in regex boundary checks.
+ */
+function _html_hilight_re_preprocess($term) {
+    return '\b'.$term.'\b';
+}
+
+/**
  * Callback used by html_hilight()
  *
  * @author Harry Fuecks <hfuecks@gmail.com>