- Implemented enhancement #016993: transactions in content/trash must…

… be reduced (cherry picked from commit e9888af) Conflicts: doc/changelogs/4.4/unstable/CHANGELOG-4.4.0alpha4-to-4.4.0alpha5
ezsystems · Jul 15, 2010 · bb2e308 · bb2e308
1 parent 4c8e64e
commit bb2e308
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/doc/changelogs/4.2/CHANGELOG-4.2.0-to-4.2.1 b/doc/changelogs/4.2/CHANGELOG-4.2.0-to-4.2.1
@@ -13,6 +13,8 @@ Changes from 4.2.0 to 4.2.1
   (Merged from trunk (4.3.0beta1) rev. 25129 + 25130)
 - Implemented enhancement #014781: translation cache isn't deleted at "Clear all caches"
   (Merged from master (4.4alpha4) commit 8322321)
+- Implemented enhancement #016993: transactions in content/trash must be reduced
+  (Merged from master (4.4alpha5) commit e9888af)
 
 *Design:
 

diff --git a/kernel/content/trash.php b/kernel/content/trash.php
@@ -59,8 +59,6 @@
         {
             $deleteIDArray = $http->postVariable( 'DeleteIDArray' );
 
-            $db = eZDB::instance();
-            $db->begin();
             foreach ( $deleteIDArray as $deleteID )
             {
 
@@ -70,13 +68,11 @@
                                                                    null,
                                                                    null,
                                                                    true );
-                eZDebug::writeNotice( $deleteID, "deleteID" );
-                foreach ( $objectList as $object )
+               foreach ( $objectList as $object )
                 {
                     $object->purge();
                 }
             }
-            $db->commit();
         }
         else
         {
@@ -89,7 +85,6 @@
     $access = $user->hasAccessTo( 'content', 'cleantrash' );
     if ( $access['accessWord'] == 'yes' )
     {
-        $db = eZDB::instance();
         while ( true )
         {
             // Fetch 100 objects at a time, to limit transaction size
@@ -102,12 +97,10 @@
             if ( count( $objectList ) < 1 )
                 break;
 
-            $db->begin();
             foreach ( $objectList as $object )
             {
                 $object->purge();
             }
-            $db->commit();
         }
     }
     else