OSDN Git Service
(root)
/
pukiwiki
/
pukiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4e50900
)
BugTrack2/171: Follow $show_passage setting
author
henoheno
<henoheno>
Sun, 16 Apr 2006 14:29:54 +0000
(23:29 +0900)
committer
henoheno
<henoheno>
Sun, 16 Apr 2006 14:29:54 +0000
(23:29 +0900)
lib/func.php
patch
|
blob
|
history
diff --git
a/lib/func.php
b/lib/func.php
index
d666f40
..
c4dfae8
100644
(file)
--- a/
lib/func.php
+++ b/
lib/func.php
@@
-1,6
+1,6
@@
<?php
// PukiWiki - Yet another WikiWikiWeb clone.
<?php
// PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: func.php,v 1.6
7 2006/04/16 13:53:0
4 henoheno Exp $
+// $Id: func.php,v 1.6
8 2006/04/16 14:29:5
4 henoheno Exp $
// Copyright (C)
// 2002-2006 PukiWiki Developers Team
// 2001-2002 Originally written by yu-ji
// Copyright (C)
// 2002-2006 PukiWiki Developers Team
// 2001-2002 Originally written by yu-ji
@@
-211,7
+211,7
@@
function do_search($word, $type = 'AND', $non_format = FALSE, $base = '')
{
global $script, $whatsnew, $search_non_list;
global $_msg_andresult, $_msg_orresult, $_msg_notfoundresult;
{
global $script, $whatsnew, $search_non_list;
global $_msg_andresult, $_msg_orresult, $_msg_notfoundresult;
- global $search_auth;
+ global $search_auth
, $show_passage
;
$retval = array();
$retval = array();
@@
-266,11
+266,12
@@
function do_search($word, $type = 'AND', $non_format = FALSE, $base = '')
return str_replace('$1', $s_word, $_msg_notfoundresult);
ksort($pages);
return str_replace('$1', $s_word, $_msg_notfoundresult);
ksort($pages);
+
$retval = '<ul>' . "\n";
foreach (array_keys($pages) as $page) {
$r_page = rawurlencode($page);
$s_page = htmlspecialchars($page);
$retval = '<ul>' . "\n";
foreach (array_keys($pages) as $page) {
$r_page = rawurlencode($page);
$s_page = htmlspecialchars($page);
- $passage =
get_passage(get_filetime($page))
;
+ $passage =
$show_passage ? ' ' . get_passage(get_filetime($page)) : ''
;
$retval .= ' <li><a href="' . $script . '?cmd=read&page=' .
$r_page . '&word=' . $r_word . '">' . $s_page .
'</a>' . $passage . '</li>' . "\n";
$retval .= ' <li><a href="' . $script . '?cmd=read&page=' .
$r_page . '&word=' . $r_word . '">' . $s_page .
'</a>' . $passage . '</li>' . "\n";