From f14d00b2823a0b6099f28162d53b1289146b12d5 Mon Sep 17 00:00:00 2001
From: Mehmet Beydogan <mbbrain@gmail.com>
Date: Tue, 24 Feb 2015 10:30:41 -0200
Subject: [PATCH] Fix activity creation error on conferences#save_apply

---
 app/controllers/conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index 972624d..d5f4bdd 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -85,9 +85,9 @@ def apply
   def save_apply
     @speech = Speech.new(speech_params)
     @speech.conference = @conference
-    create_activity!(nil, @conference, @speech, "speech_new")
     respond_to do |format|
       if @speech.save
+        create_activity!(nil, @conference, @speech, "speech_new")
         format.html { redirect_to apply_conference_path, notice: t("application_received", topic: @speech.topic.subject) }
       else
         format.html { render action: "apply" }