diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index 31de8eb27c8..2bae95091a6 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -151,18 +151,19 @@ public function getLinkData() $links = $productType->getLinks($this->getProduct()); $priceWebsiteScope = Mage::helper('downloadable')->getIsPriceWebsiteScope(); foreach ($links as $item) { + $price = $item->getPrice(); $tmpLinkItem = [ - 'link_id' => $item->getId(), - 'title' => $this->escapeHtml($item->getTitle()), - 'price' => $this->getCanReadPrice() ? $this->getPriceValue($item->getPrice()) : '', + 'link_id' => $item->getId(), + 'title' => $this->escapeHtml($item->getTitle()), + 'price' => (isset($price) && $this->getCanReadPrice()) ? $this->getPriceValue($price) : '', 'number_of_downloads' => $item->getNumberOfDownloads(), 'is_shareable' => $item->getIsShareable(), - 'link_url' => $item->getLinkUrl(), - 'link_type' => $item->getLinkType(), - 'sample_file' => $item->getSampleFile(), - 'sample_url' => $item->getSampleUrl(), - 'sample_type' => $item->getSampleType(), - 'sort_order' => $item->getSortOrder(), + 'link_url' => $item->getLinkUrl(), + 'link_type' => $item->getLinkType(), + 'sample_file' => $item->getSampleFile(), + 'sample_url' => $item->getSampleUrl(), + 'sample_type' => $item->getSampleType(), + 'sort_order' => $item->getSortOrder(), ]; if ($item->getLinkFile()) { @@ -181,10 +182,10 @@ public function getLinkData() ]) . '">' . Mage::helper('downloadable/file')->getFileFromPathFile($item->getLinkFile()) . ''; $tmpLinkItem['file_save'] = [ [ - 'file' => $item->getLinkFile(), - 'name' => $name, - 'size' => filesize($file), - 'status' => 'old' + 'file' => $item->getLinkFile(), + 'name' => $name, + 'size' => filesize($file), + 'status' => 'old', ] ]; } @@ -197,10 +198,10 @@ public function getLinkData() if (is_file($sampleFile)) { $tmpLinkItem['sample_file_save'] = [ [ - 'file' => $item->getSampleFile(), - 'name' => Mage::helper('downloadable/file')->getFileFromPathFile($item->getSampleFile()), - 'size' => filesize($sampleFile), - 'status' => 'old' + 'file' => $item->getSampleFile(), + 'name' => Mage::helper('downloadable/file')->getFileFromPathFile($item->getSampleFile()), + 'size' => filesize($sampleFile), + 'status' => 'old', ] ]; }