Skip to content

Issue#20277 fixed for 2.3.x #20354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 29, 2019
Merged

Issue#20277 fixed for 2.3.x #20354

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0759026
merge 2.3-develop
mahesh-rajawat Dec 23, 2018
9c6af93
Merge remote-tracking branch 'upstream/2.3-develop' into 2.3-develop
mahesh-rajawat Jan 9, 2019
bf246da
Merge remote-tracking branch 'upstream/2.3-develop' into 2.3-develop
mahesh-rajawat Jan 14, 2019
45c6fc7
Merge remote-tracking branch 'upstream/2.3-develop' into 2.3-develop
mahesh-rajawat Jan 16, 2019
3a01bc0
issue#20277 fixed for 2.3.x
mahesh-rajawat Jan 16, 2019
18ae227
ENGCOM-3887: Static and Unit tests fix.
p-bystritsky Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@

namespace Magento\Sales\Controller\Download;

use Magento\Framework\App\Action\HttpGetActionInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\App\Action\Context;
use Magento\Catalog\Model\Product\Type\AbstractType;
use Magento\Framework\Controller\Result\ForwardFactory;

/**
* Class DownloadCustomOption
*
* @package Magento\Sales\Controller\Download
*/
class DownloadCustomOption extends \Magento\Framework\App\Action\Action
class DownloadCustomOption extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
{
/**
* @var ForwardFactory
Expand Down Expand Up @@ -95,10 +97,11 @@ public function execute()
/** @var $productOption \Magento\Catalog\Model\Product\Option */
$productOption = $this->_objectManager->create(
\Magento\Catalog\Model\Product\Option::class
)->load($optionId);
);
$productOption->load($optionId);
}

if (!$productOption || !$productOption->getId() || $productOption->getType() != 'file') {
if ($productOption->getId() && $productOption->getType() != 'file') {
return $resultForward->forward('noroute');
}

Expand Down