Fixed #3700

craftcms · Jan 25, 2019 · b40d9c7 · b40d9c7
1 parent 27a0c96
commit b40d9c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -18,6 +18,7 @@
 - Fixed an error where indexing a volume with no files would result in an error.
 - Fixed a bug where soft-deleted assets would show up as missing after indexing.
 - Fixed a JavaScript error that could occur on the Settings → Plugins page.
+- Fixed a bug where `Craft::parseEnv()` was throwing an `InvalidConfigException` if the given string began with `@` but was not an alias. ([#3700](https://github.com/craftcms/cms/issues/3700))
 
 ## 3.1.3 - 2019-01-21
 

diff --git a/src/Craft.php b/src/Craft.php
@@ -82,7 +82,7 @@ public static function parseEnv(string $str = null)
             $str = getenv($matches[1]) ?: $str;
         }
 
-        return static::getAlias($str);
+        return static::getAlias($str, false) ?: $str;
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,7 +82,7 @@ public static function parseEnv(string $str = null) @@
                 $str = getenv($matches[1]) ?: $str;
             }
-            return static::getAlias($str);
+            return static::getAlias($str, false) ?: $str;
         }
         /**
@@ Expand Down @@