Commit ce8bb652 authored by Tom Kersten's avatar Tom Kersten Committed by Eric Davis

[#423] Removed explicit render in WikiController#show

* Allows for format extensions in plugins w/o giving a double-render
  error
* Updated Wiki#show template to specify 'wiki/sidebar' explicitly
  (vs. just 'sidebar')
parent 762cc04b
...@@ -82,7 +82,6 @@ class WikiController < ApplicationController ...@@ -82,7 +82,6 @@ class WikiController < ApplicationController
end end
end end
@editable = editable? @editable = editable?
render :action => 'show'
end end
# edit an existing page or a new one # edit an existing page or a new one
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<% end %> <% end %>
<% content_for :sidebar do %> <% content_for :sidebar do %>
<%= render :partial => 'sidebar' %> <%= render :partial => 'wiki/sidebar' %>
<% end %> <% end %>
<% html_title @page.pretty_title %> <% html_title @page.pretty_title %>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment