Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- web: fix bug there message link not correct in search results; fixes #539 

svn path=/trunk/boinc/; revision=14537
This commit is contained in:
David Anderson 2008-01-11 23:11:07 +00:00
parent 5790f15ce1
commit 037c0f0ff9
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -345,3 +345,10 @@ Rom Jan 11 2008
Rom Jan 11 2008 (HEAD) Rom Jan 11 2008 (HEAD)
- Tag for 6.1.6 release, all platforms - Tag for 6.1.6 release, all platforms
boinc_core_release_6_1_6 boinc_core_release_6_1_6
David Jan 11 2008
- web: fix bug there message link not correct in search results
fixes #539
html/user/
forum_search_action.php

9
html/user/forum_search_action.php
View File

@ -73,7 +73,7 @@ function search_post_content(
if ($forum!="" && $forum!="all"){ if ($forum!="" && $forum!="all"){
$optional_join = " LEFT JOIN DBNAME.thread ON post.thread = thread.id"; $optional_join = " LEFT JOIN DBNAME.thread ON post.thread = thread.id";
} }
$query = "select *,post.id as postid from DBNAME.post".$optional_join." where content like '".$search_string."'"; $query = "select *, DBNAME.post.id as postid from DBNAME.post".$optional_join." where content like '".$search_string."'";
if ($forum!="" && $forum!="all"){ if ($forum!="" && $forum!="all"){
$query.=" and forum = ".intval($forum->id); $query.=" and forum = ".intval($forum->id);
} }
@ -168,14 +168,17 @@ if (count($posts)){
$options = get_output_options($logged_in_user); $options = get_output_options($logged_in_user);
$options->setHighlightTerms($search_list); $options->setHighlightTerms($search_list);
foreach ($posts as $post) { foreach ($posts as $post) {
$post->id = $post->postid;
$thread = BoincThread::lookup_id($post->thread); $thread = BoincThread::lookup_id($post->thread);
if (!$thread) continue; if (!$thread) continue;
$forum = BoincForum::lookup_id($thread->forum); $forum = BoincForum::lookup_id($thread->forum);
if (!$forum) continue; if (!$forum) continue;
if (!is_forum_visible_to_user($forum, $logged_in_user)) continue; if (!is_forum_visible_to_user($forum, $logged_in_user)) continue;
if (($show_hidden_posts == false) && ($thread->hidden)) continue; if (!$show_hidden_posts) {
if (($show_hidden_posts == false) && ($post->hidden)) continue; if ($thread->hidden) continue;
if ($post->hidden) continue;
}
show_post_and_context($post, $thread, $forum, $options, $n); show_post_and_context($post, $thread, $forum, $options, $n);
$n++; $n++;
} }