- 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 · 0e7fc24 · 0e7fc24
1 parent 7790052
commit 0e7fc24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/doc/changelogs/4.1/CHANGELOG-4.1.4-to-4.1.5 b/doc/changelogs/4.1/CHANGELOG-4.1.4-to-4.1.5
@@ -9,6 +9,8 @@ Changes from 4.1.4 to 4.1.5
   (Merged from trunk (4.3.0alpha1) rev. 24346)
 - Implemented enhancement #15441: eZDBSchemaInterface subclasses do not allow to dump/rebuild a proper schema: table columns are always sorted
   (Merged from trunk (4.3.0beta1) rev. 24974)
+- Implemented enhancement #016993: transactions in content/trash must be reduced
+  (Merged from master (4.4alpha5) commit e9888af)
 
 *Design:
 
@@ -21,7 +23,7 @@ Changes from 4.1.4 to 4.1.5
 *Scripts:
 - Fixed bug #15522: Upgrade script for node assignments which are left behind
   (Merged from trunk (4.3.0beta2) rev. 25109)
- 
+
 *Translations:
 
 *Bugfixes:
@@ -121,7 +123,7 @@ Changes from 4.1.4 to 4.1.5
   (Merged from trunk (4.3.0beta1) rev. 24902)
 - Fixed bug #14615: Database errors in search engine logic using PHP 5.2.9
   (Merged from trunk (4.3.0beta1) rev. 24906)
-- Fixed bug #15823: Running cache clearing procedure from upgrade 4.2.0 using root removes all linux system files  
+- Fixed bug #15823: Running cache clearing procedure from upgrade 4.2.0 using root removes all linux system files
   (Merged from trunk (4.3.0beta1) rev. 24912)
 - Fixed bug #015673: eZCollaborationItemHandler::handleCollaborationEvent() not oracle compatible
   (Merged from trunk (4.3.0beta1) rev. 24957)

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