c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-24 11:59:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

ALPHA 3.0.2a

Browse Source
This commit is contained in:
TheGamecraft
2018-09-10 08:51:18 -04:00
parent 7fe13ae0a7
commit 0e0ef86b71
1404 changed files with 10604 additions and 33714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php vendored
View File

@@ -220,7 +220,7 @@ class FilesystemManager implements FactoryContract
$config += ['version' => 'latest'];
if ($config['key'] && $config['secret']) {
$config['credentials'] = Arr::only($config, ['key', 'secret']);
$config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
}
return $config;
@@ -236,7 +236,7 @@ class FilesystemManager implements FactoryContract
{
$client = new Rackspace($config['endpoint'], [
'username' => $config['username'], 'apiKey' => $config['key'],
]);
], $config['options'] ?? []);
$root = $config['root'] ?? null;