summaryrefslogtreecommitdiffstats
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-07 19:24:57 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-07 19:24:57 +0000
commit2cd749955e48e1f24cf429817a71787440ada057 (patch)
treec00b8a314107ed559dd821aab25487c1827ab59d /app/models/project.rb
parenteece12ddfde08646a76ac92d961c4d223349cd39 (diff)
downloadredmine-2cd749955e48e1f24cf429817a71787440ada057.tar.gz
redmine-2cd749955e48e1f24cf429817a71787440ada057.zip
Fixed: error raised when copying project wiki with wiki module disabled (#13097).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11332 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 28cb52ddc..fdb47cfdd 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -772,7 +772,7 @@ class Project < ActiveRecord::Base
def copy_wiki(project)
# Check that the source project has a wiki first
unless project.wiki.nil?
- self.wiki ||= Wiki.new
+ wiki = self.wiki || Wiki.new
wiki.attributes = project.wiki.attributes.dup.except("id", "project_id")
wiki_pages_map = {}
project.wiki.pages.each do |page|
@@ -784,6 +784,8 @@ class Project < ActiveRecord::Base
wiki.pages << new_wiki_page
wiki_pages_map[page.id] = new_wiki_page
end
+
+ self.wiki = wiki
wiki.save
# Reproduce page hierarchy
project.wiki.pages.each do |page|