Skip to content
Permalink
Browse files

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')
  • Loading branch information...
tomkersten committed May 20, 2011
1 parent 333a318 commit b4e345dca9d72d8af9e8326c7cd8642e550be379
Showing with 1 addition and 2 deletions.
  1. +0 −1 app/controllers/wiki_controller.rb
  2. +1 −1 app/views/wiki/show.rhtml
@@ -77,7 +77,6 @@ def show
end
end
@editable = editable?
render :action => 'show'
end

# edit an existing page or a new one
@@ -57,7 +57,7 @@
<% end %>

<% content_for :sidebar do %>
<%= render :partial => 'sidebar' %>
<%= render :partial => 'wiki/sidebar' %>
<% end %>

<% html_title @page.pretty_title %>

0 comments on commit b4e345d

Please sign in to comment.
You can’t perform that action at this time.