Fixed a bug where installing the plugin could fail if the plugin had …

…been installed and uninstalled before. Resolve #92
craftcms · Jul 23, 2020 · a8b3521 · a8b3521
1 parent c3f5f98
commit a8b3521
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Fixed
 - Fixed a bug where focal point detection would not work if aliases were used in the subfolder setting. ([#86](https://github.com/craftcms/aws-s3/pull/86))
+- Fixed a bug where installing the plugin could fail if the plugin had been installed and uninstalled before. ([#92](https://github.com/craftcms/aws-s3/issues/92))
 
 ## 1.2.8 - 2020-05-18
 

diff --git a/src/migrations/Install.php b/src/migrations/Install.php
@@ -62,6 +62,11 @@ private function _convertVolumes()
             if ($volume['type'] === Volume::class && isset($volume['settings']) && is_array($volume['settings'])) {
                 $settings = $volume['settings'];
 
+                // This is not a legacy S3 volume
+                if (empty($volume['location'])) {
+                    continue;
+                }
+
                 $hasUrls = !empty($volume['hasUrls']);
                 $url = ($hasUrls && !empty($settings['urlPrefix'])) ? $settings['urlPrefix'] : null;
                 $settings['region'] = $settings['location'];