summaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-04-11 12:56:18 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-04-11 12:56:18 +0000
commit58792737394c59ecac08db2cea0eeebb836f160a (patch)
tree20356d7c4801a53e47df1273d7c011441beee62c /app/controllers
parent3979224693c796b162e3bf815fa33265869f1b18 (diff)
downloadredmine-58792737394c59ecac08db2cea0eeebb836f160a.tar.gz
redmine-58792737394c59ecac08db2cea0eeebb836f160a.zip
Makes the wiki sidebar editable (#5208).
The content of the wiki page named 'Sidebar' is rendered in the sidebar if it exists. Permission to edit protected pages is required to create this page. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3632 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/wiki_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 60b59ff5f..55194e048 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -33,7 +33,7 @@ class WikiController < ApplicationController
page_title = params[:page]
@page = @wiki.find_or_new_page(page_title)
if @page.new_record?
- if User.current.allowed_to?(:edit_wiki_pages, @project)
+ if User.current.allowed_to?(:edit_wiki_pages, @project) && editable?
edit
render :action => 'edit'
else