From 8a803cae76e430dc0f358986db3420ef45049370 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 20 Apr 2012 21:42:53 +0200
Subject: some edge case checking in search result highlighting

---
 inc/html.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'inc/html.php')

diff --git a/inc/html.php b/inc/html.php
index 022cd792a..be5666353 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -280,8 +280,11 @@ function html_draft(){
  * @author Harry Fuecks <hfuecks@gmail.com>
  */
 function html_hilight($html,$phrases){
-    $phrases = array_filter((array) $phrases);
-    $regex = join('|',array_map('ft_snippet_re_preprocess', array_map('preg_quote_cb',$phrases)));
+    $phrases = (array) $phrases;
+    $phrases = array_map('preg_quote_cb', $phrases);
+    $phrases = array_map('ft_snippet_re_preprocess', $phrases);
+    $phrases = array_filter($phrases);
+    $regex = join('|',$phrases);
 
     if ($regex === '') return $html;
     if (!utf8_check($regex)) return $html;
-- 
cgit v1.2.3