Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into release/0.5

1 files changed, 3 insertions, 3 deletions

diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index dad5e81cd..f3bbd6708 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -35,9 +35,8 @@ class RequestController < ApplicationController
             # do nothing - as "authenticated?" has done the redirect to signin page for us
             return
         end
-        
         if !params[:query].nil?
-            query = params[:query] + '*'
+            query = params[:query]
             query = query.split(' ').join(' OR ')       # XXX: HACK for OR instead of default AND!
             @xapian_requests = perform_search([PublicBody], query, 'relevant', nil, 5)
         end
@@ -815,7 +814,8 @@ class RequestController < ApplicationController
                         for message in info_request.incoming_messages                
                             attachments = message.get_attachments_for_display
                             for attachment in attachments
-                                zipfile.get_output_stream(attachment.display_filename) { |f|
+                                filename = "#{attachment.url_part_number}_#{attachment.display_filename}"
+                                zipfile.get_output_stream(filename) { |f|
                                     f.puts(attachment.body)
                                 }
                             end