Merge branch 'release/0.5' into wdtk

Conflicts:
	.gitignore

1 files changed, 11 insertions, 7 deletions

diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 4b7884065..dad5e81cd 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -676,6 +676,7 @@ class RequestController < ApplicationController
     # Internal function
     def get_attachment_internal(html_conversion)
         @incoming_message = IncomingMessage.find(params[:incoming_message_id])
+        @incoming_message.parse_raw_email!
         @info_request = @incoming_message.info_request
         if @incoming_message.info_request_id != params[:id].to_i
             raise sprintf("Incoming message %d does not belong to request %d", @incoming_message.info_request_id, params[:id])
@@ -690,7 +691,6 @@ class RequestController < ApplicationController
        
         # check permissions
         raise "internal error, pre-auth filter should have caught this" if !@info_request.user_can_view?(authenticated_user)
-  
         @attachment = IncomingMessage.get_attachment_by_url_part_number(@incoming_message.get_attachments_for_display, @part_number)
         raise ActiveRecord::RecordNotFound.new("attachment not found part number " + @part_number.to_s + " incoming_message " + @incoming_message.id.to_s) if @attachment.nil?
 
@@ -713,6 +713,7 @@ class RequestController < ApplicationController
                     :email => _("Then you can upload an FOI response. "),
                     :email_subject => _("Confirm your account on {{site_name}}",:site_name=>site_name)
             }
+
             if !authenticated?(@reason_params)
                 return
             end
@@ -754,11 +755,14 @@ class RequestController < ApplicationController
     def search_typeahead
         # Since acts_as_xapian doesn't support the Partial match flag, we work around it
         # by making the last work a wildcard, which is quite the same
-        query = params[:q] + '*'
-
-        query = query.split(' ').join(' OR ')       # XXX: HACK for OR instead of default AND!
-        @xapian_requests = perform_search([InfoRequestEvent], query, 'relevant', 'request_collapse', 5)
-
+        query = params[:q]
+        query = query.split(' ')
+        if query.last.nil? || query.last.strip.length < 3
+            @xapian_requests = nil
+        else
+            query = query.join(' OR ')       # XXX: HACK for OR instead of default AND!
+            @xapian_requests = perform_search([InfoRequestEvent], query, 'relevant', 'request_collapse', 5)
+        end
         render :partial => "request/search_ahead.rhtml"
     end
 
@@ -774,7 +778,7 @@ class RequestController < ApplicationController
                               :email => _("Then you can download a zip file of {{info_request_title}}.",:info_request_title=>info_request.title),
                               :email_subject => _("Log in to download a zip file of {{info_request_title}}",:info_request_title=>info_request.title)
                               )
-                updated = Digest::SHA1.hexdigest(info_request.get_last_event.created_at.to_s + info_request.updated_at.to_s)
+                updated = Digest::SHA1.hexdigest(info_request.get_last_event.created_at.to_i.to_s + info_request.updated_at.to_i.to_s)
                 @url_path = "/download/#{updated[0..1]}/#{updated}/#{params[:url_title]}.zip"
                 file_path = File.join(File.dirname(__FILE__), '../../cache/zips', @url_path)
                 if !File.exists?(file_path)