aboutsummaryrefslogtreecommitdiffstats
path: root/vendor
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-01-19 13:53:24 +0000
committerRobin Houston <robin.houston@gmail.com>2012-01-19 13:53:24 +0000
commit79c39c2a493824590c1862816649bc62e718fe19 (patch)
tree1b51e901f4aa4fd6c72e6ecbd3563fc07b27e1eb /vendor
parent22b2db48c005be1d1b87dd6b58f830a2a74d2108 (diff)
parentbf66cd1d1d4faa249c692f13543e43f2bd6b0c03 (diff)
Merge branch 'wdtk' of https://github.com/sebbacon/alaveteli into wdtk
Conflicts: app/controllers/application_controller.rb
Diffstat (limited to 'vendor')
-rw-r--r--vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
index dd033a112..656b722f6 100644
--- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
+++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
@@ -444,7 +444,7 @@ module ActsAsXapian
user_query = ActsAsXapian.query_parser.parse_query(
self.query_string,
Xapian::QueryParser::FLAG_BOOLEAN | Xapian::QueryParser::FLAG_PHRASE |
- Xapian::QueryParser::FLAG_LOVEHATE | Xapian::QueryParser::FLAG_WILDCARD |
+ Xapian::QueryParser::FLAG_LOVEHATE |
Xapian::QueryParser::FLAG_SPELLING_CORRECTION)
end
self.query = Xapian::Query.new(Xapian::Query::OP_AND, model_query, user_query)