Merge branch 'release/3.2.23' into v3

nystudio107 · Sep 6, 2019 · 2d07e94 · 2d07e94
2 parents fe0b34a + 95e42eb
commit 2d07e94
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # SEOmatic Changelog
 
+## 3.2.23 - 2019.09.06
+### Changed
+* Fixed a typo in the environment info popup
+* If the SEO image is not on a local volume, avoid a potentially long round-trip by being paranoid, and defaulting to not generating the image transform immediately
+
 ## 3.2.22 - 2019.09.03
 ### Changed
 * Cleaned up the `title` parsing to allow for `siteName` only titles more cleanly

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-seomatic",
     "description": "SEOmatic facilitates modern SEO best practices & implementation for Craft CMS 3. It is a turnkey SEO system that is comprehensive, powerful, and flexible.",
     "type": "craft-plugin",
-    "version": "3.2.22",
+    "version": "3.2.23",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/helpers/ImageTransform.php b/src/helpers/ImageTransform.php
@@ -17,6 +17,7 @@
 use Craft;
 use craft\elements\Asset;
 use craft\models\AssetTransform;
+use craft\volumes\Local;
 
 use yii\base\InvalidConfigException;
 
@@ -113,8 +114,14 @@ public static function socialTransform(
             // If we're not in local dev, tell it to generate the transform immediately so that
             // urls like `actions/assets/generate-transform` don't get cached
             $generateNow = Seomatic::$environment === EnvironmentHelper::SEOMATIC_DEV_ENV ? null : true;
-            // Preflight to ensure that the source asset actually exists to avoid Craft hanging
-            if ($volume !== null && !$volume->fileExists($asset->getPath())) {
+            if ($volume instanceof Local) {
+                // Preflight to ensure that the source asset actually exists to avoid Craft hanging
+                if ($volume !== null && !$volume->fileExists($asset->getPath())) {
+                    $generateNow = false;
+                }
+            } else {
+                // If this is not a local volume, avoid a potentially long round-trip by
+                // being paranoid, and defaulting to not generating the image now
                 $generateNow = false;
             }
             try {

diff --git a/src/templates/settings/_includes/environment-warning.twig b/src/templates/settings/_includes/environment-warning.twig
@@ -2,7 +2,7 @@
     <p class="notice">
         Environment: <strong>{{ seomatic.getEnvironment() }}</strong>
         <span class="info">
-            {{ ("The SEOmatic environment, either `live`, `staging`, or `local`. This setting controls whether certain things render, and is configured in [Plugin Settings](" ~ cpUrl('seomatic/plugin') ~ ").<br><br> In the `live` production environment will Google Analytics and other tracking tags send analytics data.<br><br> SEOmatic also automatically sets the `robots` tag to `none` for everything but the `live` production environment.") | md | striptags('<code><br><a>') | raw }}
+            {{ ("The SEOmatic environment, either `live`, `staging`, or `local`. This setting controls whether certain things render, and is configured in [Plugin Settings](" ~ cpUrl('seomatic/plugin') ~ ").<br><br>Only in the `live` production environment will Google Analytics and other tracking tags send analytics data.<br><br> SEOmatic also automatically sets the `robots` tag to `none` for everything but the `live` production environment.") | md | striptags('<code><br><a>') | raw }}
         </span>
     </p>
 </div>