Re: [xwiki-devs] [xwiki-notifications] r28419 - platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web

Author: sdumitriu Date: 2010-04-17 03:47:52 +0200 (Sat, 17 Apr 2010) New Revision: 28419 Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/DeleteVersionsAction.java Log: XWIKI-5121: Weird behavior when deleting the head of the history of a renamed document Fixed. Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/DeleteVersionsAction.java =================================================================== --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/DeleteVersionsAction.java 2010-04-17 01:23:30 UTC (rev 28418) +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/DeleteVersionsAction.java 2010-04-17 01:47:52 UTC (rev 28419) @@ -73,6 +73,10 @@ // If we delete the most recent (current) version, then rollback to latest undeleted version. if (!tdoc.getRCSVersion().equals(archive.getLatestVersion())) { XWikiDocument newdoc = archive.loadDocument(archive.getLatestVersion(), context); + // Reset the document reference, since the one taken from the archive might be wrong (old name from + // before a rename) + newdoc.setDocumentReference(tdoc.getDocumentReference()); + newdoc.setMetaDataDirty(false); context.getWiki().getStore().saveXWikiDoc(newdoc, context); context.setDoc(newdoc); }