lib/stream/fires.rb in Stream-0.1.14 vs lib/stream/fires.rb in Stream-0.1.15

@@ -42,22 +42,19 @@
               gallery = activity.subject.gallery
               photo = activity.subject
               # Find recent photo activity
               last_activity = ActivityItem.find(:first, 
                                                 :conditions => ["subject_type = ? AND photos.gallery_id = ? AND DATE(activity_items.updated_at) = current_date",
-                                                self.class,gallery_id],:include=>[:photos])
+                                                activity.subject.class,gallery.id],:include=>[:photos])
                                                 
               unless last_activity && (gallery.eql?(last_activity.subject.gallery))
                 ([activity.actor] + gallery.allowed_contacts).each do |p| 
                   activity.is_hidden = activity.subject.approval_status==true ? true : false 
                   activity.photos << activity.subject
                   activity.save
                   p.activity_items << activity
                   send(:"after_#{opts[:on]}", method_name, :if => opts[:if])
                 end
-              else
-                last_activity.photos << self
-                last_activity.update_attribute(:updated_at,Time.now)
               end
             else
               activity.save  
               ([activity.actor] + activity.actor.contacts).each{|p| p.activity_items << activity }
               send(:"after_#{opts[:on]}", method_name, :if => opts[:if])