Fixed #47 for real.

craftcms · Mar 27, 2019 · a5d912d · a5d912d
1 parent dbe4687
commit a5d912d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
 ### Added
 - Added the `makeUploadsPublic` setting which defaults to true and determines whether the uploaded Assets are public on the bucket. ([#48](https://github.com/craftcms/aws-s3/issues/48))
 
+### Fixed
+- Fixed an error that could occur when installing the plugin on a site that was migrated from Craft 2. ([#47](https://github.com/craftcms/aws-s3/issues/47))
+
 ## 1.2.1 - 2019-03-05
 
 ### Changed

diff --git a/src/migrations/Install.php b/src/migrations/Install.php
@@ -67,6 +67,10 @@ private function _convertVolumes()
                 $settings['region'] = $settings['location'];
                 unset($settings['urlPrefix'], $settings['location'], $settings['storageClass']);
 
+                if (preg_match('/^([\d]+)([a-z]+)$/', $settings['expires'], $matches)) {
+                    $settings['expires'] = $matches[1] . ' ' . $matches[2];
+                }
+
                 $volume['url'] = $url;
                 $volume['settings'] = $settings;