Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions Controller/Adminhtml/Ajax/RetrieveImage.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use Magento\Backend\App\Action\Context;
use Magento\Catalog\Model\Product\Media\Config as ProductMediaConfig;
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Controller\Result\RawFactory as ResultRawFactory;
use Magento\Framework\Exception\LocalizedException;
Expand All @@ -22,7 +21,7 @@
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class RetrieveImage extends \Magento\Backend\App\Action implements HttpPostActionInterface
class RetrieveImage extends \Magento\Backend\App\Action
{
/**
* @var ResultRawFactory
Expand Down
7 changes: 4 additions & 3 deletions Model/BatchDownloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,6 @@ public function __construct(
$this->_extensionValidator = $extensionValidator;
$this->_synchronizationChecker = $synchronizationChecker;
$this->_synchronisationRepository = $synchronisationRepository;
if ($this->_configuration->isEnabled()) {
$this->_authorise();
}
}

private function _authorise()
Expand All @@ -167,6 +164,10 @@ private function _authorise()
*/
public function downloadUnsynchronisedImages(OutputInterface $output = null, $override = false)
{
if ($this->_configuration->isEnabled()) {
$this->_authorise();
}

//= Config
$this->_output = $output;
$this->_override = (bool) $override;
Expand Down
2 changes: 1 addition & 1 deletion Model/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public function getCdnSubdomainStatus()
*/
public function getUserPlatform()
{
return sprintf(self::USER_PLATFORM_TEMPLATE, '1.9.1', '2.0.0');
return sprintf(self::USER_PLATFORM_TEMPLATE, '1.9.2', '2.0.0');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion Model/ImageRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function findUnsynchronisedImages()
private function getRecursiveIterator($directory)
{
return new \RecursiveIteratorIterator(
new \RecursiveDirectoryIterator($directory),
new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS),
\RecursiveIteratorIterator::SELF_FIRST
);
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "cloudinary/cloudinary-magento2",
"description": "Cloudinary Magento 2 Integration.",
"type": "magento2-module",
"version": "1.9.1",
"version": "1.9.2",
"license": "MIT",
"require": {
"cloudinary/cloudinary_php": "*"
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Cloudinary_Cloudinary" setup_version="1.9.1">
<module name="Cloudinary_Cloudinary" setup_version="1.9.2">
<sequence>
<module name="Magento_ProductVideo"/>
</sequence>
Expand Down
2 changes: 1 addition & 1 deletion marketplace.composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cloudinary/cloudinary",
"type": "magento2-module",
"version": "1.9.1",
"version": "1.9.2",
"description": "Cloudinary Magento 2 Integration.",
"license": "MIT",
"require": {
Expand Down