diff options
| author | Michael Hamann <michael@content-space.de> | 2010-10-10 14:26:22 +0200 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2010-10-10 14:26:22 +0200 |
| commit | 762b4c44c691f69d521413d7016314e7f547c102 (patch) | |
| tree | 95ab294b1df2f8c7a5efb56762a0f284bec3754e /inc/html.php | |
| parent | eae17177de8f3f3580af5ea66d126aee0f23227f (diff) | |
| parent | 4ea48b361401e136dbfd3339af368ceeb5b27480 (diff) | |
| download | rpg-762b4c44c691f69d521413d7016314e7f547c102.tar.gz rpg-762b4c44c691f69d521413d7016314e7f547c102.tar.bz2 | |
Merge remote branch 'origin/master' into sitemap
Diffstat (limited to 'inc/html.php')
| -rw-r--r-- | inc/html.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/inc/html.php b/inc/html.php index add559971..02afa00e9 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); @@ -319,13 +319,6 @@ function html_search(){ print p_locale_xhtml('searchpage'); flush(); - //check if search is restricted to namespace - if(preg_match('/@([^@]*)/',$QUERY,$match)) { - $id = cleanID($match[1]); - } else { - $id = cleanID($QUERY); - } - //show progressbar print '<div class="centeralign" id="dw__loading">'.NL; print '<script type="text/javascript" charset="utf-8"><!--//--><![CDATA[//><!--'.NL; @@ -337,7 +330,7 @@ function html_search(){ //do quick pagesearch $data = array(); - if($id) $data = ft_pageLookup($id,true,useHeading('navigation')); + $data = ft_pageLookup($QUERY,true,useHeading('navigation')); if(count($data)){ print '<div class="search_quickresult">'; print '<h3>'.$lang['quickhits'].':</h3>'; |