diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-12 13:54:53 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-12 13:54:53 +0000 |
| commit | 50da9903f9a390fa5c5b32b9af889f13b2954030 (patch) | |
| tree | 2bcfaa2b7cbe0eedccad518c8c2d064203a2143c /app/controllers/application_controller.rb | |
| parent | 9125f4c3023a49266fbe45fe5ac1e8b1bd9e47a7 (diff) | |
| parent | d84353a0dbff7c4543c7f4423d7b63728c7041c3 (diff) | |
Merge branch 'release/0.5' into wdtk
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 05f88a6b2..7aa522389 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -371,8 +371,8 @@ class ApplicationController < ActionController::Base # XXX this is a result of the OR hack below -- should fix by # allowing a parameter to perform_search to control the # default operator! - query = query.gsub(/(\s-\s|&)/, "") - query = query.split(/ +(?!-)/) + query = query.strip.gsub(/(\s-\s|&)/, "") + query = query.split(/ +(?![-+]+)/) if query.last.nil? || query.last.strip.length < 3 xapian_requests = nil else |