r1699 - xwiki/trunk/core/src/main/java/com/xpn/xwiki

[Ludovic Dubost]

Author: ludovic
Date: 2006-12-08 00:15:19 +0100 (Fri, 08 Dec 2006)
New Revision: 1699

Modified:
   xwiki/trunk/core/src/main/java/com/xpn/xwiki/XWiki.java
Log:
XWIKI-421  New version of the fix for copying document accross wikis including attachments.

Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/core/src/main/java/com/xpn/xwiki/XWiki.java	2006-12-07 16:49:11 UTC (rev 1698)
+++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/XWiki.java	2006-12-07 23:15:19 UTC (rev 1699)
@@ -2747,6 +2747,8 @@
                         getVersioningStore().saveXWikiDocArchive(txda, true, context);
                     }
 
+                    if (targetWiki != null)
+                        context.setDatabase(targetWiki);
                     List attachlist = tdoc.getAttachmentList();
                     if (attachlist.size() > 0) {
                         for (int i = 0; i < attachlist.size(); i++) {
@@ -2825,6 +2827,8 @@
                         getVersioningStore().saveXWikiDocArchive(txda, true, context);
                     }
 
+                    if (targetWiki != null)
+                        context.setDatabase(targetWiki);
                     List attachlist = tdoc.getAttachmentList();
                     if (attachlist.size() > 0) {
                         for (int i = 0; i < attachlist.size(); i++) {