Fixed PHP error

craftcms · Jul 9, 2024 · a5fb309 · a5fb309
1 parent a933f12
commit a5fb309
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Fixed an error that occurred when attempting to save a user via the <kbd>Command</kbd>/<kbd>Ctrl</kbd> + <kbd>S</kbd> keyboard shortcut within a slideout. ([#15307](https://github.com/craftcms/cms/issues/15307))
 - Fixed a bug where “Delete heading” buttons within Customize Sources modals were getting text cursors. ([#15317](https://github.com/craftcms/cms/issues/15317))
 - Fixed a bug where disclosure hint text wasn’t legible on hover. ([#15316](https://github.com/craftcms/cms/issues/15316))
+- Fixed an error that occurred if the System Name was set to a nonexistent environment variable.
 
 ## 5.2.5 - 2024-07-02
 

diff --git a/src/base/ApplicationTrait.php b/src/base/ApplicationTrait.php
@@ -917,8 +917,9 @@ public function saveInfo(Info $info, ?array $attributeNames = null): bool
      */
     public function getSystemName(): string
     {
-        if (($name = Craft::$app->getProjectConfig()->get('system.name')) !== null) {
-            return App::parseEnv($name);
+        $name = App::parseEnv(Craft::$app->getProjectConfig()->get('system.name'));
+        if ($name !== null) {
+            return $name;
         }
 
         try {