diff options
| author | Hakan Sandell <hakan.sandell@home.se> | 2010-10-08 21:15:19 +0200 |
|---|---|---|
| committer | Hakan Sandell <hakan.sandell@home.se> | 2010-10-08 21:15:19 +0200 |
| commit | e3626db54846ba20cefbc1a9e2d8e29c40137067 (patch) | |
| tree | be549543a7c36718ffb06a6293fe80ee0675ec92 /inc/html.php | |
| parent | 7cceaa7443c80b526a6bbad32b6cbdf5d759fd39 (diff) | |
| parent | 4ea48b361401e136dbfd3339af368ceeb5b27480 (diff) | |
| download | rpg-e3626db54846ba20cefbc1a9e2d8e29c40137067.tar.gz rpg-e3626db54846ba20cefbc1a9e2d8e29c40137067.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/html.php')
| -rw-r--r-- | inc/html.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/inc/html.php b/inc/html.php index 968a63e4e..02afa00e9 100644 --- a/inc/html.php +++ b/inc/html.php @@ -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>'; |