diff options
| author | Hakan Sandell <hakan.sandell@home.se> | 2010-10-03 14:16:13 +0200 |
|---|---|---|
| committer | Hakan Sandell <hakan.sandell@home.se> | 2010-10-03 14:16:13 +0200 |
| commit | 7cceaa7443c80b526a6bbad32b6cbdf5d759fd39 (patch) | |
| tree | 37b75aab8bf88ad11745c8abe37ec6ebb8d68e8c /inc/html.php | |
| parent | 831c10d03192413b75ee2be21fb314e0797fdc23 (diff) | |
| parent | c1e6807d8013592efafd00472f75ea08dc7347ec (diff) | |
| download | rpg-7cceaa7443c80b526a6bbad32b6cbdf5d759fd39.tar.gz rpg-7cceaa7443c80b526a6bbad32b6cbdf5d759fd39.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/html.php')
| -rw-r--r-- | inc/html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/html.php b/inc/html.php index add559971..968a63e4e 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('ft_snippet_re_preprocess', array_map('preg_quote_cb',$phrases))); if ($regex === '') return $html; $html = preg_replace_callback("/((<[^>]*)|$regex)/ui",'html_hilight_callback',$html); |