0
@@ -54,14 +54,17 @@
0
     rescue ActiveRecord::RecordInvalid
0
       show_article_with 'errors' => @comment.errors.full_messages, 'submitted' => params[:comment]
0
     rescue Article::CommentNotAllowed
0
-      show_article_with 'errors' => ["Commenting has been disabled on this article"]
0
+      commenting_disabled = site.call_render(nil, :__commenting_disabled, {}, nil, :layout => false) rescue "Commenting has been disabled on this article"
0
+      show_article_with 'errors' => [commenting_disabled]
0
     rescue Comment::Previewing
0
-      show_article_with 'errors' => ["Previewing your comment"], 'submitted' => params[:comment]
0
+      previewing_comment = site.call_render(nil, :__previewing_comment, {}, nil, :layout => false) rescue "Previewing your comment"
0
+      show_article_with 'errors' => [previewing_comment], 'submitted' => params[:comment]
0
     end
0
     
0
     def dispatch_comment
0
       @skip_caching = true
0
-      show_article_with 'message' => 'Thanks for the comment!'
0
+      message = site.call_render(nil, :__thanks_for_comment, {}, nil, :layout => false) rescue "Thanks for the comment!"
0
+      show_article_with 'message' => message
0
     end
0
 
0
     def dispatch_archives

0
@@ -193,13 +193,19 @@
0
     comment_age.to_i > -1
0
   end
0
 
0
-  def call_render(section, template_type, assigns = {}, controller = nil)
0
+  def call_render(section, template_type, assigns = {}, controller = nil, options = {})
0
     assigns.update('site' => to_liquid(section), 'mode' => template_type)
0
     assigns.update(default_assigns) unless default_assigns.empty?
0
+    options.reverse_merge!(:layout => true)
0
     template = set_content_template(section, template_type)
0
-    layout = set_layout_template(section, template_type)
0
     handler = @@template_handlers[theme.extension] || @@template_handlers[".liquid"]
0
-    handler.new(self).render(section, layout, template, assigns, controller)
0
+    
0
+    if options[:layout]
0
+      layout = set_layout_template(section, template_type)
0
+      handler.new(self).render(section, layout, template, assigns, controller)
0
+    else
0
+      handler.new(self).parse_inner_template(template, assigns, controller)
0
+    end
0
   end
0
   
0
   def to_liquid(current_section = nil)