Merge branch 'master' into api

# Conflicts:
#	.env.testing
#	public/mix-manifest.json
#	src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
This commit is contained in:
Čarodej
2022-05-11 09:00:42 +02:00
83 changed files with 803 additions and 472 deletions

View File

@@ -236,9 +236,9 @@ if (! function_exists('setEnvironmentValue')) {
if ($keyPosition) {
$endOfLinePosition = strpos($str, "\n", $keyPosition);
$oldLine = substr($str, $keyPosition, $endOfLinePosition - $keyPosition);
$str = str_replace($oldLine, "{$envKey}={$envValue}", $str);
$str = str_replace($oldLine, "{$envKey}=\"{$envValue}\"", $str);
} else {
$str .= "\n$envKey=$envValue";
$str .= "\n$envKey=\"$envValue\"";
}
}
}