From ce8bb652c6e7679134838d1c42ef4f3268ceae05 Mon Sep 17 00:00:00 2001 From: Tom Kersten Date: Thu, 19 May 2011 21:49:36 -0500 Subject: [PATCH] [#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') --- app/controllers/wiki_controller.rb | 1 - app/views/wiki/show.rhtml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index c1e6fa6e..ad8f2634 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -82,7 +82,6 @@ class WikiController < ApplicationController end end @editable = editable? - render :action => 'show' end # edit an existing page or a new one diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml index c17dd482..c5b9bb86 100644 --- a/app/views/wiki/show.rhtml +++ b/app/views/wiki/show.rhtml @@ -57,7 +57,7 @@ <% end %> <% content_for :sidebar do %> - <%= render :partial => 'sidebar' %> + <%= render :partial => 'wiki/sidebar' %> <% end %> <% html_title @page.pretty_title %>