Merge branch 'release/0.21'0.21.0.0

Conflicts:
	locale/cy/app.po
	locale/es_NI/app.po
	locale/hr/app.po
	locale/is_IS/app.po
	locale/sr@latin/app.po

1 files changed, 4 insertions, 5 deletions

diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 9dde3ba80..635ba8f58 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -161,11 +161,10 @@ class InfoRequestEvent < ActiveRecord::Base
     end
 
     def incoming_message_selective_columns(fields)
-        message = IncomingMessage.find(:all,
-                                       :select => fields + ", incoming_messages.info_request_id",
-                                       :joins => "INNER JOIN info_request_events ON incoming_messages.id = incoming_message_id ",
-                                       :conditions => "info_request_events.id = #{self.id}"
-                                       )
+        message = IncomingMessage.select("#{ fields }, incoming_messages.info_request_id").
+            joins('INNER JOIN info_request_events ON incoming_messages.id = incoming_message_id').
+                where('info_request_events.id = ?', id)
+
         message = message[0]
         if !message.nil?
             message.info_request = InfoRequest.find(message.info_request_id)