Mercurial > hg > soundsoftware-site

diff app/controllers/wikis_controller.rb @ 931:ec1c49528f36 cannam_integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "redmine-1.3"
author Chris Cannam
date Wed, 27 Jun 2012 15:04:58 +0100
parents 5f33065ddc4b
children 433d4f72a19b
line wrap: on
line diff
--- a/app/controllers/wikis_controller.rb	Wed Jun 27 14:56:14 2012 +0100
+++ b/app/controllers/wikis_controller.rb	Wed Jun 27 15:04:58 2012 +0100
@@ -22,7 +22,7 @@
   # 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