nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-26 10:30:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into api

Browse Source 
# 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
parent 4250e58370 000b5459f9
commit d2371e667f
83 changed files with 803 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Support/Upgrading/Controllers/UpgradingVersionsController.php
+7
View File
@@ -22,6 +22,13 @@ class UpgradingVersionsController
) {
}
public function upgrade_to_2_1_2(): void
{
($this->updateLanguageStrings)([
'allow_recaptcha' => 'Allow ReCaptcha v3',
]);
}
public function upgrade_to_2_1_1(): void
{
($this->upgradeDatabase)();
src/Support/helpers.php
+2 -2
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\"";
}
}
}