Merge branch 'brakeman_fixes' into rails-3-develop

1 files changed, 3 insertions, 5 deletions

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