Merge branch 'hotfix/0.13.0.3' into rails-3-develop

1 files changed, 11 insertions, 1 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 86cc98371..aaced91a2 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -977,11 +977,21 @@ public
 
     def InfoRequest.count_old_unclassified(extra_params={})
         params = old_unclassified_params(extra_params)
+        if extra_params[:conditions]
+            condition_string = extra_params[:conditions].shift
+            params[:conditions][0] += " AND #{condition_string}"
+            params[:conditions] += extra_params[:conditions]
+        end
         count(:all, params)
     end
 
-    def InfoRequest.get_random_old_unclassified(limit)
+    def InfoRequest.get_random_old_unclassified(limit, extra_params)
         params = old_unclassified_params({})
+        if extra_params[:conditions]
+            condition_string = extra_params[:conditions].shift
+            params[:conditions][0] += " AND #{condition_string}"
+            params[:conditions] += extra_params[:conditions]
+        end
         params[:limit] = limit
         params[:order] = "random()"
         find(:all, params)