Index: kernel/content/removeeditversion.php
===================================================================
--- kernel/content/removeeditversion.php	(revision 22638)
+++ kernel/content/removeeditversion.php	(working copy)
@@ -82,25 +82,30 @@
     {
         $Module->redirectTo( $http->sessionVariable( 'RedirectIfDiscarded' ) );
         $http->removeSessionVariable( 'RedirectIfDiscarded' );
-        $http->removeSessionVariable( 'ParentObject' );
-        $http->removeSessionVariable( 'NewObjectID' );
         $hasRedirected = true;
     }
     if ( $http->hasSessionVariable( 'ParentObject' ) && $http->sessionVariable( 'NewObjectID' ) == $objectID )
     {
         $parentArray = $http->sessionVariable( 'ParentObject' );
         $parentURL = $Module->redirectionURI( 'content', 'edit', $parentArray );
-        $http->removeSessionVariable( 'ParentObject' );
-        $http->removeSessionVariable( 'NewObjectID' );
         $Module->redirectTo( $parentURL );
         $hasRedirected = true;
     }
 
-    if ( $hasRedirected == false )
+    $http->removeSessionVariable( 'RedirectURIAfterPublish' );
+    $http->removeSessionVariable( 'ParentObject' );
+    $http->removeSessionVariable( 'NewObjectID' );
+
+    if ( $hasRedirected )
     {
-        if ( isset( $nodeID ) && $nodeID )
-            return $Module->redirectTo( '/content/view/full/' . $nodeID .'/' );
-
+        return;
+    }
+    else if ( isset( $nodeID ) && $nodeID )
+    {
+        return $Module->redirectTo( '/content/view/full/' . $nodeID . '/' );
+    }
+    else
+    {
         return eZRedirectManager::redirectTo( $Module, '/', true, array( 'content/edit' ) );
     }
 }