Permalink
Browse files

Add back AND

  • Loading branch information...
1 parent d499683 commit 6cc6a91d2b988b03beefbc7dc60f4a008a5166d8 @pudge pudge committed Sep 2, 2004
Showing with 4 additions and 4 deletions.
  1. +4 −4 plugins/Search/Search.pm
View
@@ -182,13 +182,13 @@ sub findStory {
# _score() call above would still have to be done twice,
# which depending on search_method could be the same
# thing, so it might not matter. - Jamie 2004/04/06
- my $where = "stories.stoid = story_text.stoid ";
- $where .= " story_param.name IS NULL";
+ my $where = "stories.stoid = story_text.stoid";
+ $where .= " AND story_param.name IS NULL";
$where .= " AND ( MATCH (title) AGAINST ($query)
OR MATCH (introtext,bodytext) AGAINST ($query) ) "
if $form->{query};
- $where .= " AND time < NOW() AND stories.in_trash = 'no' AND primaryskid != 0 ";
+ $where .= " AND time < NOW() AND stories.in_trash = 'no' AND primaryskid != 0";
$where .= " AND stories.uid=" . $self->sqlQuote($form->{author})
if $form->{author};
$where .= " AND stories.submitter=" . $self->sqlQuote($form->{submitter})
@@ -241,7 +241,7 @@ sub findStory {
}
my $string = join(',', @{$self->sqlQuote(\@tids)});
if ($constants->{topic_search_use_join}) {
- $tables.= " LEFT JOIN story_topics_rendered ON stories.stoid = story_topics_rendered.stoid ";
+ $tables.= " LEFT JOIN story_topics_rendered ON stories.stoid = story_topics_rendered.stoid";
# XXXSKIN - no more id in schema, just yank?
# $where .= " AND story_topics_rendered.id IS NOT NULL";
$where .= " AND story_topics_rendered.tid IN ($string)";

0 comments on commit 6cc6a91

Please sign in to comment.