Merge remote-tracking branch 'origin/next' into env-var-descriptions

2026-07-13 01:04:28 +00:00 · 2026-02-28 00:09:54 +01:00
parent 87f9ce0674 6b2a669cb9
commit d9e39ba211
404 changed files with 29406 additions and 26356 deletions
@@ -147,6 +147,12 @@ class EnvironmentVariable extends BaseModel
                }

                $real_value = $this->get_real_environment_variables($this->value, $resource);
+
+                // Skip escaping for valid JSON objects/arrays to prevent quote corruption (see #6160)
+                if (json_validate($real_value) && (str_starts_with($real_value, '{') || str_starts_with($real_value, '['))) {
+                    return $real_value;
+                }
+
                if ($this->is_literal || $this->is_multiline) {
                    $real_value = '\''.$real_value.'\'';
                } else {