Stop &/and as people may type either.

2 files changed, 7 insertions, 0 deletions

diff --git a/todo.txt b/todo.txt
index 34f8babe3..fe4812473 100644
--- a/todo.txt
+++ b/todo.txt
@@ -5,6 +5,8 @@ Private policy wiki to put administrative documentation e.g. what to do with a
 notification of possibly libelous material, how to handle common support email
 types etc.
 
+Factor out "defunct/not_apply" from request_email into own field.
+
 
 Check up on how the public old request status editing is being used in 
 practice. Think about UI a bit more to try and up rate, and UI of
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 3f71d8e3c..941a59735 100644
--- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
+++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
@@ -140,6 +140,11 @@ module ActsAsXapian
         @@query_parser.database = @@db
         @@query_parser.default_op = Xapian::Query::OP_AND
 
+        @@stopper = Xapian::SimpleStopper.new
+        @@stopper.add("and")
+        @@stopper.add("&")
+        @@query_parser.stopper = @@stopper
+
         @@terms_by_capital = {}
         @@values_by_number = {}
         @@values_by_prefix = {}