summaryrefslogtreecommitdiff
path: root/inc/html.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2010-10-27 20:53:59 +0200
committerAndreas Gohr <andi@splitbrain.org>2010-10-27 20:53:59 +0200
commit55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8 (patch)
tree1bf1359fee6044a704ac8465753e3c147d61e6e3 /inc/html.php
parente8b9cf5ae263f3b97aaa389dddd9e7458cc0894c (diff)
parentbaef77a2b52933a6dd7caf3f641ff5ce6e6164f3 (diff)
downloadrpg-55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8.tar.gz
rpg-55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8.tar.bz2
Merge branch 'master' into stable
Diffstat (limited to 'inc/html.php')
-rw-r--r--inc/html.php9
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>';