diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-19 17:54:27 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-19 17:54:27 +0000 |
| commit | 3e1f5cee154a97c074d7ee83e2ec9817895a8d96 (patch) | |
| tree | ad7f7bf79f241ecedd983fea8d376c302c09e2a7 /phpBB/search.php | |
| parent | ae91951754a0fcb881674f7beda0f98df810fc4c (diff) | |
| download | forums-3e1f5cee154a97c074d7ee83e2ec9817895a8d96.tar forums-3e1f5cee154a97c074d7ee83e2ec9817895a8d96.tar.gz forums-3e1f5cee154a97c074d7ee83e2ec9817895a8d96.tar.bz2 forums-3e1f5cee154a97c074d7ee83e2ec9817895a8d96.tar.xz forums-3e1f5cee154a97c074d7ee83e2ec9817895a8d96.zip | |
Fixed bug #483105
git-svn-id: file:///svn/phpbb/trunk@1370 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 43edc166ed..819515de8a 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -423,7 +423,7 @@ else if( $query_keywords != "" || $query_author != "" || $search_id ) break; } */ - $sql_fields = ( $show_results == "posts") ? "pt.post_text, pt.post_subject, p.post_id, p.post_time, p.post_username, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid" : "f.forum_id, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, t.topic_views, t.topic_replies, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username" ; + $sql_fields = ( $show_results == "posts") ? "pt.post_text, pt.post_subject, p.post_id, p.post_time, p.post_username, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid" : "f.forum_id, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, t.topic_views, t.topic_replies, t.topic_last_post_id, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username" ; $sql_from = ( $show_results == "posts") ? FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt" : FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2, " . USERS_TABLE . " u2"; @@ -745,14 +745,14 @@ else if( $query_keywords != "" || $query_author != "" || $search_id ) "L_TOPIC" => $lang['Topic']) ); - $highlight_matches = ""; + $highlight_active = ""; for($j = 0; $j < count($split_search); $j++ ) { $split_word = $split_search[$j]; if( $split_word != "and" && $split_word != "or" && $split_word != "not" ) { - $highlight_matches .= " " . $split_word; + $highlight_active .= " " . $split_word; $search_string[] = "#\b(" . preg_quote(str_replace("*", ".*?", $split_word), "#") . ")\b#i"; $replace_string[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>"; @@ -766,20 +766,20 @@ else if( $query_keywords != "" || $query_author != "" || $search_id ) $search_string[] = "#\b(" . preg_quote($match_synonym, "#") . ")\b#i"; $replace_string[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>"; - $highlight_matches .= " " . $match_synonym; + $highlight_active .= " " . $match_synonym; } } } } - $highlight_matches = urlencode(trim($highlight_matches)); + $highlight_active = urlencode(trim($highlight_active)); for($i = 0; $i < min($per_page, count($searchset)); $i++) { $forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $searchset[$i]['forum_id']); - $topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $searchset[$i]['topic_id'] . "&highlight=$highlight_matches"); + $topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $searchset[$i]['topic_id'] . "&highlight=$highlight_active"); $poster_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $searchset[$i]['user_id']); - $post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $searchset[$i]['post_id'] . "&highlight=$highlight_matches#" . $searchset[$i]['post_id']); + $post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $searchset[$i]['post_id'] . "&highlight=$highlight_active#" . $searchset[$i]['post_id']); $post_date = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']); @@ -925,7 +925,7 @@ else if( $query_keywords != "" || $query_author != "" || $search_id ) $times = 1; for($j = 0; $j < $replies + 1; $j += $board_config['topics_per_page']) { - $base_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&start=$j&highlight=$highlight_matches"); + $base_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&start=$j&highlight=$highlight_active"); if( $times > 4 ) { |