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
2013-02-07 19:24:57 +00:00
parent eece12ddfd
commit 2cd749955e
2 changed files with 12 additions and 1 deletions
@@ -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|