From 225c972c114a7acf8355e316d62996ee0ceedd3c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Mar 2016 08:23:58 +0000
Subject: [PATCH] Merged r15130 (#21900).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15197 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/wiki_page.rb     |  2 +-
 test/unit/wiki_page_test.rb | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

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
diff --git a/test/unit/wiki_page_test.rb b/test/unit/wiki_page_test.rb
index 5fb184175..518db078d 100644
--- a/test/unit/wiki_page_test.rb
+++ b/test/unit/wiki_page_test.rb
@@ -121,6 +121,24 @@ class WikiPageTest < ActiveSupport::TestCase
     assert_equal parent, child.parent
   end
 
+  def test_move_parent_with_child_with_duplicate_name_should_not_move_child
+    parent = WikiPage.create!(:wiki_id => 1, :title => 'Parent')
+    child = WikiPage.create!(:wiki_id => 1, :title => 'Child', :parent_id => parent.id)
+    parent.reload
+    # page with the same name as the child in the target wiki
+    WikiPage.create!(:wiki_id => 2, :title => 'Child')
+
+    parent.wiki_id = 2
+    parent.save!
+
+    parent.reload
+    assert_equal 2, parent.wiki_id
+
+    child.reload
+    assert_equal 1, child.wiki_id
+    assert_nil child.parent_id
+  end
+
   def test_destroy
     page = WikiPage.find(1)
     page.destroy
-- 
2.39.5