summaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-03-12 08:23:58 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-03-12 08:23:58 +0000
commit225c972c114a7acf8355e316d62996ee0ceedd3c (patch)
treead4f1570d78369f96e94dbf58749878d4c29257b /app/models
parent5784d98129a132e2fe383e699f50075bc92cf009 (diff)
downloadredmine-225c972c114a7acf8355e316d62996ee0ceedd3c.tar.gz
redmine-225c972c114a7acf8355e316d62996ee0ceedd3c.zip
Merged r15130 (#21900).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15197 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
-rw-r--r--app/models/wiki_page.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 988819a77..fd8bc061e 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -126,7 +126,7 @@ class WikiPage < ActiveRecord::Base
child.wiki_id = wiki_id
child.redirect_existing_links = redirect_existing_links
unless child.save
- WikiPage.where(:id => child.id).update_all :parent_nil => nil
+ WikiPage.where(:id => child.id).update_all :parent_id => nil
end
end
end