Skip to content

Update ImageLocator.php #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
didix16 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update ImageLocator.php #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dce7327
Update ImageLocator.php
didix16 Jan 24, 2017
d5eb8f1
Update ImageLocator.php
didix16 Jan 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Templating/ImageLocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ public function __construct(Kernel $kernel)
public function getImagePath($logicalImageName)
{
$pos = strpos($logicalImageName, ':');

$exists = is_dir($this->kernel->getRootDir() . '/Resources/public/images/');

// add support for ::$imagePath syntax as in twig
// @see http://symfony.com/doc/current/book/page_creation.html#optional-step-3-create-the-template
if($pos === false || $pos === 0)
{
return $this->kernel->getRootDir() . '/Resources/public/images/' . ltrim($logicalImageName, ':');
return $this->kernel->getRootDir() . '/Resources/public/'.(!$exists ? 'img/' : 'images/') . ltrim($logicalImageName, ':');
}

$bundleName = substr($logicalImageName, 0, $pos);
Expand All @@ -48,6 +50,7 @@ public function getImagePath($logicalImageName)
$bundle = $this->kernel->getBundle($bundleName);
$bundlePath = $bundle->getPath();

return $bundlePath.'/Resources/public/images/'.$imageName;
return $bundlePath.'/Resources/public/'.(!$exists ? 'img/' : 'images/') .$imageName;

}
}