diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bd34b2a15..a4587b8c2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -48,7 +48,7 @@ module ApplicationHelper
def error_messages_for(instance_name)
instance = instance_variable_get("@#{instance_name}")
- if instance.errors.any?
+ if instance && instance.errors.any?
%{
Error: #{instance.__send__(:errors).full_messages.join(", ")}
}.html_safe
else
""
diff --git a/app/models/forum_post.rb b/app/models/forum_post.rb
index d33c916e2..a7b3880f6 100644
--- a/app/models/forum_post.rb
+++ b/app/models/forum_post.rb
@@ -104,9 +104,13 @@ class ForumPost < ActiveRecord::Base
self.is_deleted = false if is_deleted.nil?
end
+ def quoted_response
+ "[quote]\n#{body}\n[/quote]\n\n"
+ end
+
def build_response
dup.tap do |x|
- x.body = "[quote]\n#{x.body}\n[/quote]\n\n"
+ x.body = x.quoted_response
end
end
end
diff --git a/app/views/forum_posts/_form.html.erb b/app/views/forum_posts/_form.html.erb
index f33d31649..dcede6314 100644
--- a/app/views/forum_posts/_form.html.erb
+++ b/app/views/forum_posts/_form.html.erb
@@ -1,6 +1,6 @@
<%= error_messages_for("forum_post") %>
-<%= simple_form_for(@forum_post) do |f| %>
+<%= simple_form_for(forum_post) do |f| %>
<%= f.input :topic_id, :as => :hidden %>
<%= dtext_field "forum_post", "body" %>
diff --git a/app/views/forum_posts/_forum_post.html.erb b/app/views/forum_posts/_forum_post.html.erb
index 7ca48ea8e..baf0d032d 100644
--- a/app/views/forum_posts/_forum_post.html.erb
+++ b/app/views/forum_posts/_forum_post.html.erb
@@ -15,7 +15,7 @@
<%= format_text(forum_post.body) %>