Merge pull request #920 from OskarStark/backport-reference

Backport PR #846 to master
sonata-project · Jan 5, 2016 · 81b41e9 · 81b41e9
2 parents 0f568b9 + 30ed6e3
commit 81b41e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Tests/Provider/ImageProviderTest.php b/Tests/Provider/ImageProviderTest.php
@@ -69,6 +69,9 @@ public function testProvider()
         $this->assertSame('default/0011/24', $provider->generatePath($media));
         $this->assertSame('/uploads/media/default/0011/24/thumb_1023456_big.png', $provider->generatePublicUrl($media, 'big'));
         $this->assertSame('/uploads/media/default/0011/24/ASDASDAS.png', $provider->generatePublicUrl($media, 'reference'));
+
+        $this->assertSame('default/0011/24/ASDASDAS.png', $provider->generatePrivateUrl($media, 'reference'));
+        $this->assertSame('default/0011/24/thumb_1023456_big.png', $provider->generatePrivateUrl($media, 'big'));
     }
 
     public function testHelperProperies()

diff --git a/Thumbnail/FormatThumbnail.php b/Thumbnail/FormatThumbnail.php
@@ -48,7 +48,12 @@ public function generatePublicUrl(MediaProviderInterface $provider, MediaInterfa
      */
     public function generatePrivateUrl(MediaProviderInterface $provider, MediaInterface $media, $format)
     {
-        return sprintf('%s/thumb_%s_%s.%s',
+        if ('reference' === $format) {
+            return $provider->getReferenceImage($media);
+        }
+
+        return sprintf(
+            '%s/thumb_%s_%s.%s',
             $provider->generatePath($media),
             $media->getId(),
             $format,