From d355026740f39039e44e909544464c1a1fead233 Mon Sep 17 00:00:00 2001
From: Bertrand Dunogier <bd@ez.no>
Date: Tue, 24 Sep 2013 14:29:59 +0200
Subject: [PATCH] Revert "Fixed EZP-20558 - Workflow Event/Approve not working
 correctly"

This reverts commit c2992a1675594ac2a7aa5aff97692d635781ae92.

Replaced by the fix for http://jira.ez.no/browse/EZP-21599.
---
 kernel/content/edit.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/kernel/content/edit.php b/kernel/content/edit.php
index 28613a3bdbf..26983aa269f 100644
--- a/kernel/content/edit.php
+++ b/kernel/content/edit.php
@@ -729,15 +729,12 @@ function computeRedirect( $module, $object, $version, $EditLanguage = false )
 
             eZDebug::accumulatorStart( 'publish', '', 'publish' );
             $oldObjectName = $object->name();
-            $db = eZDB::instance();
 
             $behaviour = new ezpContentPublishingBehaviour();
             $behaviour->isTemporary = true;
             $behaviour->disableAsynchronousPublishing = false;
             ezpContentPublishingBehaviour::setBehaviour( $behaviour );
 
-            // Getting the current transaction counter to check if all transactions are committed during content/publish operation (see below)
-            $transactionCounter = $db->transactionCounter();
             $operationResult = eZOperationHandler::execute( 'content', 'publish', array( 'object_id' => $object->attribute( 'id' ),
                                                                                          'version' => $version->attribute( 'version' ) ) );
             eZDebug::accumulatorStop( 'publish' );
@@ -745,17 +742,6 @@ function computeRedirect( $module, $object, $version, $EditLanguage = false )
             if ( ( array_key_exists( 'status', $operationResult ) && $operationResult['status'] != eZModuleOperationInfo::STATUS_CONTINUE ) )
             {
                 eZDebug::writeDebug( $operationResult, __FILE__ );
-
-                // Check if publication related transaction counter is clean.
-                // If not, operation is probably in STATUS_CANCELLED, STATUS_HALTED, STATUS_REPEAT or STATUS_QUEUED
-                // and final commit was not done as it's part of the operation body (see commit-transaction action in content/publish operation definition).
-                // Important note: Will only be committed transactions that weren't closed during the content/publish operation
-                $transactionDiff = $db->transactionCounter() - $transactionCounter;
-                for ( $i = 0; $i < $transactionDiff; ++$i )
-                {
-                    $db->commit();
-                }
-
                 switch( $operationResult['status'] )
                 {
                     case eZModuleOperationInfo::STATUS_REPEAT: