From dd23b38f4e16f5ecb9f7580074d9f2f5dabad779 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Mon, 23 Mar 2015 04:48:13 +0000
Subject: [PATCH] VRFS-2916 fixed subquery override from block

---
 admin/app/models/cohort.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/app/models/cohort.rb b/admin/app/models/cohort.rb
index 29523a46d..6f78902f2 100644
--- a/admin/app/models/cohort.rb
+++ b/admin/app/models/cohort.rb
@@ -168,7 +168,7 @@ WHERE
     tt.created_at >= '#{start_date}' AND 
     tt.created_at <= '#{end_date}'
 SQL
-    yield(sql) if block_given?
+    sql = yield(sql) if block_given?
     self.class.cohort_users(self).where("users.id IN (#{sql})").count
   end
   
@@ -272,7 +272,7 @@ SQL
 
     count = _subquery(assoc_key = :jam_track_rights, num_user)
     _put_data_set(assoc_key, count, num_user)
-
+    
     count = _subquery(assoc_key = :jam_tracks_played, num_user) do |subsql|
       subsql += " AND tt.playable_type = 'JamRuby::JamTrack' "
     end