summaryrefslogtreecommitdiff
path: root/help/app/controllers
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-02-06 14:29:44 +0100
committerAzul <azul@leap.se>2013-02-06 14:29:44 +0100
commit0362663decaa1c861b183ec3773f69952398a976 (patch)
treef5cecb371612a4ba579578d9f95b8b961fe47e12 /help/app/controllers
parent37d3a5b4fd06ff75d21740cf0f70d0eb0c43e586 (diff)
parent8fbee620476db018ca096f1a448dbfde9f9eb95a (diff)
Merge remote-tracking branch 'leap/master'
Diffstat (limited to 'help/app/controllers')
-rw-r--r--help/app/controllers/tickets_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/help/app/controllers/tickets_controller.rb b/help/app/controllers/tickets_controller.rb
index d5a3da7..6562048 100644
--- a/help/app/controllers/tickets_controller.rb
+++ b/help/app/controllers/tickets_controller.rb
@@ -18,7 +18,7 @@ class TicketsController < ApplicationController
@ticket.comments.last.posted_by = (logged_in? ? current_user.id : nil) #protecting posted_by isn't working, so this should protect it.
@ticket.created_by = current_user.id if logged_in?
- @ticket.email = current_user.email if logged_in? and current_user.email
+ @ticket.email = current_user.email_address if logged_in? and current_user.email_address
flash[:notice] = 'Ticket was successfully created.' if @ticket.save