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; 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); } 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; }