summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfox <[email protected]>2022-12-02 22:48:41 +0300
committerfox <[email protected]>2022-12-02 22:48:41 +0300
commit64b4b9a3d4aba85e86fc32dbc2319bba04499074 (patch)
tree29ea39a8b4686f0892294c65161c8144ddd3913c
parent188df4f99a79485b6d8bd353bf384e4a7eec11df (diff)
parent183618e89372b9370b848842f0d7d9ad22a9a60d (diff)
Merge pull request 'Prevent double slashes in full path.' (#1) from wn/ttrss-cache-s3:bugfix/get-full-path into master
Reviewed-on: https://dev.tt-rss.org/tt-rss/ttrss-cache-s3/pulls/1
-rw-r--r--init.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/init.php b/init.php
index 7f8d5f5..10946c9 100644
--- a/init.php
+++ b/init.php
@@ -87,7 +87,7 @@ class Cache_S3 extends Plugin implements Cache_Adapter {
}
public function get_full_path(string $filename): string {
- return 's3://' . Config::get(self::CACHE_S3_BUCKET) . '/' . $this->dir . '/' . basename(clean($filename));
+ return 's3://' . Config::get(self::CACHE_S3_BUCKET) . '/' . ($this->dir ? $this->dir . '/' : '') . basename(clean($filename));
}
public function get_mime_type(string $filename) {