Merge branch 'brakeman_fixes' into rails-3-develop

1 files changed, 3 insertions, 3 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