Revert of Mage_Adminhtml_Block_Widget_Grid::_exportIterateCollection (#…

…1914)
OpenMage · Dec 23, 2021 · 4e7a8e1 · 4e7a8e1
1 parent 758dc6c
commit 4e7a8e1
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
@@ -971,23 +971,29 @@ public function _exportIterateCollection($callback, array $args)
         $originalCollection = $this->getCollection();
         $count = null;
         $page  = 1;
+        $lPage = null;
+        $break = false;
 
-        do {
+        while ($break !== true) {
             $collection = clone $originalCollection;
             $collection->setPageSize($this->_exportPageSize);
             $collection->setCurPage($page);
             $collection->load();
-
-            $count = $collection->count();
-
-            $page++;
+            if (is_null($count)) {
+                $count = $collection->getSize();
+                $lPage = $collection->getLastPageNumber();
+            }
+            if ($lPage == $page) {
+                $break = true;
+            }
+            $page ++;
 
             foreach ($collection as $item) {
                 call_user_func_array(array($this, $callback), array_merge(array($item), $args));
             }
             $collection->clear();
             unset($collection);
-        } while($count == $this->_exportPageSize);
+        }
     }
 
     /**