Merge branch 'brakeman_fixes' into rails-3-develop

3 files changed, 10 insertions, 13 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 20b7ef9af..2b60e13d8 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1366,9 +1366,9 @@ public
     end
 
     def InfoRequest.find_in_state(state)
-        find(:all, :select => '*, ' + last_event_time_clause + ' as last_event_time',
-                   :conditions => ["described_state = ?", state],
-                   :order => "last_event_time")
+        select("*, #{ last_event_time_clause } as last_event_time").
+            where(:described_state => state).
+                order('last_event_time')
     end
 
     private
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)
diff --git a/app/models/user.rb b/app/models/user.rb
index 1c6dc0eb0..c953e52f2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -264,11 +264,9 @@ class User < ActiveRecord::Base
     # Returns list of requests which the user hasn't described (and last
     # changed more than a day ago)
     def get_undescribed_requests
-        info_requests.find(
-            :all,
-            :conditions => [ 'awaiting_description = ? and ' + InfoRequest.last_event_time_clause + ' < ?',
-                true, Time.now() - 1.day
-            ]
+        info_requests.where(
+            "awaiting_description = ? and #{ InfoRequest.last_event_time_clause } < ?",
+            true, 1.day.ago
         )
     end