Merge pull request #33 from cloudinary/v1.9.3

CLOUDINARY-143: Fixed issue When installing the M2 module the error: …
cloudinary · Jul 14, 2019 · a29bd85 · a29bd85
2 parents 34cdcf6 + 3cbfdb7
commit a29bd85
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Core/AutoUploadMapping/ApiClient.php b/Core/AutoUploadMapping/ApiClient.php
@@ -56,7 +56,6 @@ public function __construct(
      */
     public static function fromConfiguration(ConfigurationInterface $configuration)
     {
-        $this->authorise();
         return new ApiClient(
             $configuration,
             new ConfigurationBuilder($configuration),
@@ -149,7 +148,7 @@ function (array $mapping) use ($url) {
 
     private function authorise()
     {
-        if (!$this->_authorised && $configuration->isEnabled()) {
+        if (!$this->_authorised && $this->configuration->isEnabled()) {
             Cloudinary::config($this->configurationBuilder->build());
             Cloudinary::$USER_PLATFORM = $this->configuration->getUserPlatform();
             $this->_authorised = true;

diff --git a/Core/CloudinaryImageProvider.php b/Core/CloudinaryImageProvider.php
@@ -50,7 +50,6 @@ public function __construct(
      */
     public static function fromConfiguration(ConfigurationInterface $configuration)
     {
-        $this->authorise();
         return new CloudinaryImageProvider(
             $configuration,
             new ConfigurationBuilder($configuration),
@@ -156,7 +155,7 @@ public function validateCredentials()
 
     private function authorise()
     {
-        if (!$this->_authorised && $configuration->isEnabled()) {
+        if (!$this->_authorised && $this->configuration->isEnabled()) {
             Cloudinary::config($this->configurationBuilder->build());
             Cloudinary::$USER_PLATFORM = $this->configuration->getUserPlatform();
             $this->_authorised = true;