[#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')
This commit is contained in:
Tom Kersten 2011-05-19 21:49:36 -05:00 committed by Eric Davis
parent 762cc04b70
commit ce8bb652c6
2 changed files with 1 additions and 2 deletions

View File

@ -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

View File

@ -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 %>