This commit is contained in:
Maxime Renou 2019-07-11 16:55:43 +02:00
parent 2dbcc322f1
commit c1ab0494ce
1 changed files with 8 additions and 1 deletions

View File

@ -40,6 +40,11 @@ class S3Storage implements StorageAdaptor
]); ]);
} }
public function getClient()
{
return $this->client;
}
public function mode($name) public function mode($name)
{ {
if ($name == 'public') return self::MODE_PUBLIC; if ($name == 'public') return self::MODE_PUBLIC;
@ -63,8 +68,10 @@ class S3Storage implements StorageAdaptor
protected function getPrefix($prefix = null) protected function getPrefix($prefix = null)
{ {
$ret = ''; $ret = '';
if (isset($this->config['path'])) { if (isset($this->config['path']) && !empty($this->config['path']))
{
$ret = trim($this->config['path'], '/').'/'; $ret = trim($this->config['path'], '/').'/';
if (trim($ret) == '/') $ret = '';
} }
if (!is_null($prefix)) { if (!is_null($prefix)) {
$ret = ltrim($prefix, '/'); $ret = ltrim($prefix, '/');