Author: tdraier
Date: Wed Sep 26 15:52:33 2007
New Revision: 18671
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18671&repname=
=3Djahia
Log:
fixed copy/paste with deleted content
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportExportBaseService.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/imp=
ortexport/ImportExportBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/importexport/ImportExportBaseServi=
ce.java&rev=3D18671&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportExportBaseService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportExportBaseService.java Wed Sep 26 15:52:33 2007
@@ -715,7 +715,7 @@
view =3D false;
break;
}
- } else if (entryState =3D=3D null || entryState.getWorkflowSta=
te() =3D=3D EntryLoadRequest.DELETED_WORKFLOW_STATE) {
+ } else if (entryState =3D=3D null || entryState.getWorkflowSta=
te() =3D=3D EntryLoadRequest.DELETED_WORKFLOW_STATE || entryState.getVersio=
nID() =3D=3D EntryLoadRequest.DELETED_WORKFLOW_STATE) {
if (object instanceof ContentPage && ((ContentPage)object)=
.getPageType(toLoadRequest) =3D=3D JahiaPage.TYPE_DIRECT) {
boolean found =3D false;
List locs =3D jParams.getSite().getLanguageSettingsAsL=
ocales(true);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list