Skip to content

Commit

Permalink
Merge pull request #2531 from bolt/bugfix/svg_filepath
Browse files Browse the repository at this point in the history
Corrected the filepath for getsvg() function
  • Loading branch information
I-Valchev authored Apr 14, 2021
2 parents 0072abf + fa80969 commit 65e586b
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/Twig/ImageExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,24 @@ class ImageExtension extends AbstractExtension
/** @var Packages */
private $assets;

/** @var string */
private $publicFolder;

public function __construct(
MediaRepository $mediaRepository,
Notifications $notifications,
ThumbnailHelper $thumbnailHelper,
ContentExtension $contentExtension,
Packages $assets)
Packages $assets,
string $publicFolder,
string $projectDir)
{
$this->mediaRepository = $mediaRepository;
$this->notifications = $notifications;
$this->thumbnailHelper = $thumbnailHelper;
$this->contentExtension = $contentExtension;
$this->assets = $assets;
$this->publicFolder = $projectDir . DIRECTORY_SEPARATOR . $publicFolder;
}

/**
Expand Down Expand Up @@ -143,7 +149,7 @@ public function getMedia($image): ?Media
*/
public function getSvg($image): ?string
{
$image = $this->assets->getUrl($this->getFilename($image, true), 'files');
$image = $this->publicFolder . $this->assets->getUrl($this->getFilename($image, true), 'files');
$extension = pathinfo($image, PATHINFO_EXTENSION);

if ($extension !== 'svg') {
Expand Down

0 comments on commit 65e586b

Please sign in to comment.