diff --git a/app/Models/Foundation/Main/File.php b/app/Models/Foundation/Main/File.php index 7e73e7b4..752588e0 100644 --- a/app/Models/Foundation/Main/File.php +++ b/app/Models/Foundation/Main/File.php @@ -275,11 +275,13 @@ class File extends SilverstripeBaseModel */ public function getCloudLink() { + $relativeLink = ltrim($this->getRelativeLinkFor(), '/'); + return - sprintf("%s/%s%s", + sprintf("%s/%s/%s", Config::get("cloudstorage.base_url") , Config::get("cloudstorage.assets_container"), - $this->getRelativeLinkFor()); + $relativeLink); } /** @@ -287,12 +289,14 @@ class File extends SilverstripeBaseModel * @return string */ public static function getCloudLinkForImages(string $imageRelativePath):string { + $imageRelativePath = ltrim($$imageRelativePath, '/'); + + return - sprintf("%s/%s%s", + sprintf("%s/%s/%s", Config::get("cloudstorage.base_url") , Config::get("cloudstorage.images_container"), - $imageRelativePath - ); + $imageRelativePath); } /** diff --git a/tests/OAuth2SpeakersApiTest.php b/tests/OAuth2SpeakersApiTest.php index 001f6e43..43c979e2 100644 --- a/tests/OAuth2SpeakersApiTest.php +++ b/tests/OAuth2SpeakersApiTest.php @@ -288,7 +288,7 @@ final class OAuth2SpeakersApiTest extends ProtectedApiTest { $params = [ - 'id' => 23, + 'id' => 26, 'page' => 1, 'per_page' => 10, 'order' => '+id'