diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-06 20:34:38 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-06 20:34:38 +0000 |
| commit | efddab48bed65c55c57ac9b95c40a42f059a136f (patch) | |
| tree | 947fd0f3daf62c964cb572b42c65e71b6318463c /app | |
| parent | fef2e4b67252415fefe54da856db3a77c3143dfe (diff) | |
| download | redmine-efddab48bed65c55c57ac9b95c40a42f059a136f.tar.gz redmine-efddab48bed65c55c57ac9b95c40a42f059a136f.zip | |
Prevent mass-assignment when adding/updating a wiki (#10390).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9138 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/wikis_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/wiki.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb index 523b80678..251b2a963 100644 --- a/app/controllers/wikis_controller.rb +++ b/app/controllers/wikis_controller.rb @@ -22,7 +22,7 @@ class WikisController < ApplicationController # Create or update a project's wiki def edit @wiki = @project.wiki || Wiki.new(:project => @project) - @wiki.attributes = params[:wiki] + @wiki.safe_attributes = params[:wiki] @wiki.save if request.post? render(:update) {|page| page.replace_html "tab-content-wiki", :partial => 'projects/settings/wiki'} end diff --git a/app/models/wiki.rb b/app/models/wiki.rb index 1b4301707..6cdfa246d 100644 --- a/app/models/wiki.rb +++ b/app/models/wiki.rb @@ -16,6 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class Wiki < ActiveRecord::Base + include Redmine::SafeAttributes belongs_to :project has_many :pages, :class_name => 'WikiPage', :dependent => :destroy, :order => 'title' has_many :redirects, :class_name => 'WikiRedirect', :dependent => :delete_all @@ -25,6 +26,8 @@ class Wiki < ActiveRecord::Base validates_presence_of :start_page validates_format_of :start_page, :with => /^[^,\.\/\?\;\|\:]*$/ + safe_attributes 'start_page' + def visible?(user=User.current) !user.nil? && user.allowed_to?(:view_wiki_pages, project) end |