From c830ba5a1e686ef3faecab5d3406fc1ec261e80a Mon Sep 17 00:00:00 2001 From: Ng Kiat Siong Date: Tue, 27 Jun 2023 21:07:04 +0800 Subject: [PATCH 1/3] Fixed getQuote() returns null in quote item and quote address objects. (#3355) --- app/code/core/Mage/Sales/Model/Quote/Address.php | 3 +++ app/code/core/Mage/Sales/Model/Quote/Item.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address.php b/app/code/core/Mage/Sales/Model/Quote/Address.php index 7acfd689fc0..60bcfa76a41 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address.php @@ -427,6 +427,9 @@ public function setQuote(Mage_Sales_Model_Quote $quote) */ public function getQuote() { + if (is_null($this->_quote)) { + $this->_quote = Mage::getModel('sales/quote')->load($this->getQuoteId()); + } return $this->_quote; } diff --git a/app/code/core/Mage/Sales/Model/Quote/Item.php b/app/code/core/Mage/Sales/Model/Quote/Item.php index 0001e7c0332..08206170b31 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item.php @@ -272,6 +272,9 @@ public function setQuote(Mage_Sales_Model_Quote $quote) */ public function getQuote() { + if (is_null($this->_quote)) { + $this->_quote = Mage::getModel('sales/quote')->load($this->getQuoteId()); + } return $this->_quote; } From 197cf79651942a1f922e04f20f41e641784efcde Mon Sep 17 00:00:00 2001 From: kyrena <78410399+kyrena@users.noreply.github.com> Date: Fri, 30 Jun 2023 09:15:35 +0200 Subject: [PATCH 2/3] Fixed passing null is deprecated for strpos in Mage_Core_Controller_Varien_Action (#3327) --- app/code/core/Mage/Core/Controller/Varien/Action.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php index efe4e775f06..7ebe3580c2a 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Action.php +++ b/app/code/core/Mage/Core/Controller/Varien/Action.php @@ -790,8 +790,7 @@ protected function _getRefererUrl() if ($url = $this->getRequest()->getParam(self::PARAM_NAME_URL_ENCODED)) { $refererUrl = Mage::helper('core')->urlDecodeAndEscape($url); } - - if (!$this->_isUrlInternal($refererUrl)) { + if (empty($refererUrl) || !$this->_isUrlInternal($refererUrl)) { $refererUrl = Mage::app()->getStore()->getBaseUrl(); } return $refererUrl; From b20f5687ef436916c3d82565132c05c7cde0211b Mon Sep 17 00:00:00 2001 From: kyrena <78410399+kyrena@users.noreply.github.com> Date: Fri, 30 Jun 2023 09:16:07 +0200 Subject: [PATCH 3/3] Fixed passing null is deprecated for htmlspecialchars in Mage_Core_Helper_Abstract (#3324) Co-authored-by: Fabrizio Balliano Co-authored-by: Ng Kiat Siong --- app/code/core/Mage/Core/Helper/Abstract.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/code/core/Mage/Core/Helper/Abstract.php b/app/code/core/Mage/Core/Helper/Abstract.php index 012e580ab11..ffbd2503a61 100644 --- a/app/code/core/Mage/Core/Helper/Abstract.php +++ b/app/code/core/Mage/Core/Helper/Abstract.php @@ -343,6 +343,9 @@ public function jsQuoteEscape($data, $quote = '\'') */ public function quoteEscape($data, $addSlashes = false) { + if (!$data) { + return $data; + } if ($addSlashes === true) { $data = addslashes($data); }