[Aplaws-commit] r152 - ccm-cms/trunk/src/com/arsdigita/cms

[<mb...@re...>]

Author: mbooth
Date: 2004-12-15 23:33:54 +0100 (Wed, 15 Dec 2004)
New Revision: 152

Modified:
   ccm-cms/trunk/src/com/arsdigita/cms/ContentItem.java
Log:
Fix republish


Modified: ccm-cms/trunk/src/com/arsdigita/cms/ContentItem.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ContentItem.java	2004-12-10 13:57:54 UTC (rev 151)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ContentItem.java	2004-12-15 22:33:54 UTC (rev 152)
@@ -1116,7 +1116,7 @@
                                 "; unpublishing the parent");
                 }
 
-                ((ContentItem) parent).unpublish();
+                ((ContentItem) parent).setLive( null );
             }
 
             s_log.debug("Setting the live version association to null and " +
@@ -1240,6 +1240,9 @@
             s_log.debug( "Republishing item " + getOID().toString() );
         }
 
+        applyTag( "Republished" );
+        Versions.suspendVersioning();
+
         Assert.truth( isLive(), "Attempt to republish non live item " + getOID() );
 
         Lifecycle cycle = getLifecycle();
@@ -1250,6 +1253,7 @@
         }
 
         ContentItem newLive = createPendingVersion( cycle );
+        setLive( null );
         promotePendingVersion( newLive );
     }