Merge pull request #5605 from pixelfed/staging

Staging
This commit is contained in:
daniel 2025-01-26 00:40:43 -07:00 committed by GitHub
commit ad9a5f5a43
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -876,6 +876,13 @@ trait AdminSettingsController
if (! $isValid) {
return response()->json(['error' => true, 's3_vce' => true, 'message' => "<div class='border border-danger text-danger p-3 font-weight-bold rounded-lg'>The S3/Spaces credentials you provided are invalid, or the bucket does not have the proper permissions.</div><br/>Please check all fields and try again.<br/><br/><strong>Any cloud storage configuration changes you made have NOT been saved due to invalid credentials.</strong>"], 400);
}
ConfigCacheService::put($dkey . 'key', $key);
ConfigCacheService::put($dkey . 'secret', $secret);
ConfigCacheService::put($dkey . 'region', $region);
ConfigCacheService::put($dkey . 'bucket', $bucket);
ConfigCacheService::put($dkey . 'endpoint', $endpoint);
ConfigCacheService::put($dkey . 'url', $url);
}
$res['changes'] = json_encode($changes);
}