Broadcast is up

2016-07-18 20:18:25 -07:00
parent 2c0de5b038
commit 1b95a5eb3d
7 changed files with 127 additions and 24 deletions
@@ -36,8 +36,8 @@ class UserMailer < ActionMailer::Base
 		@content = content
 		@banner = nil
 		@conference = Conference.find(conference) if conference.present?
-		@user = Conference.find(user) if user.present?
-		@subject = "[#{conference ? conference.title : 'Bike!Bike!'}] #{subject}"
+		@user = User.find(user) if user.present?
+		@subject = "[#{@conference ? @conference.title : 'Bike!Bike!'}] #{subject}"
 		if @user && @user.named_email
 			mail to: @user.named_email, subject: @subject
 		end