diff options
| author | Hakan Sandell <sandell.hakan@gmail.com> | 2010-11-13 15:29:49 +0100 |
|---|---|---|
| committer | Hakan Sandell <sandell.hakan@gmail.com> | 2010-11-13 15:29:49 +0100 |
| commit | 14928129ac979d50664cff367377db5364f8e663 (patch) | |
| tree | c244ebec8400361b7f084503f3ae40b2142647d5 /inc/search.php | |
| parent | bcb79ff3b3b63c74a93cdf4762fa0cd1bb28d17a (diff) | |
| parent | ebb29737d32bc331541f78a1a47f33ba33919938 (diff) | |
| download | rpg-14928129ac979d50664cff367377db5364f8e663.tar.gz rpg-14928129ac979d50664cff367377db5364f8e663.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/search.php')
| -rw-r--r-- | inc/search.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/search.php b/inc/search.php index 8273eef8c..03abec0c0 100644 --- a/inc/search.php +++ b/inc/search.php @@ -119,7 +119,7 @@ function search_index(&$data,$base,$file,$type,$lvl,$opts){ return false; } - $id = pathID($file); + $id = pathID($file,($type == 'd')); if($type=='d' && $conf['sneaky_index'] && auth_quickaclcheck($id.':') < AUTH_READ){ return false; @@ -550,7 +550,7 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){ $return = true; // get ID and check if it is a valid one - $item['id'] = pathID($file,$opts['keeptxt']); + $item['id'] = pathID($file,($type == 'd' || $opts['keeptxt'])); if($item['id'] != cleanID($item['id'])){ if($opts['showmsg']) msg(hsc($item['id']).' is not a valid file name for DokuWiki - skipped',-1); |