From b80a75188dd65f2e402e6d2c720e750737ab3be3 Mon Sep 17 00:00:00 2001 From: Ivan Chepurnyi Date: Thu, 19 Jul 2012 18:29:52 +0300 Subject: [PATCH 1/2] Fixed non reasonable usage of memory for collection, where possible to use more appropriate load() method of the model. --- .../Mage/Adminhtml/controllers/Sales/OrderController.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php index e891015d4e8d0..7ad5f479dc220 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php @@ -721,10 +721,7 @@ public function transactionsAction() public function addressAction() { $addressId = $this->getRequest()->getParam('address_id'); - $address = Mage::getModel('Mage_Sales_Model_Order_Address') - ->getCollection() - ->addFilter('entity_id', $addressId) - ->getItemById($addressId); + $address = Mage::getModel('Mage_Sales_Model_Order_Address')->load($addressId); if ($address) { Mage::register('order_address', $address); $this->loadLayout(); From cd665b12ef70709f5eaa5e2c45d0d48ec692deda Mon Sep 17 00:00:00 2001 From: Ivan Chepurnyi Date: Thu, 19 Jul 2012 20:47:47 +0300 Subject: [PATCH 2/2] Added fix for loaded object check, to prevent viewing form if address not found. --- .../core/Mage/Adminhtml/controllers/Sales/OrderController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php index 7ad5f479dc220..fd63ffd09a6d3 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php @@ -722,7 +722,7 @@ public function addressAction() { $addressId = $this->getRequest()->getParam('address_id'); $address = Mage::getModel('Mage_Sales_Model_Order_Address')->load($addressId); - if ($address) { + if ($address->getId()) { Mage::register('order_address', $address); $this->loadLayout(); // Do not display VAT validation button on edit order address form