[BUGFIX] Invalid file identifier with GIFBUILDER 58/37158/4
authorXavier Perseguers <xavier@typo3.org>
Tue, 24 Feb 2015 09:30:31 +0000 (10:30 +0100)
committerXavier Perseguers <xavier@typo3.org>
Mon, 13 Apr 2015 15:50:40 +0000 (17:50 +0200)
Reference to the original file is missing.

Resolves: #62184
Releases: master, 6.2
Change-Id: I0e8e9ced11c37544baee2ca40d4da647e12d485b
Reviewed-on: http://review.typo3.org/37158
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Stephan GroƟberndt <stephan@grossberndt.de>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Xavier Perseguers <xavier@typo3.org>
Tested-by: Xavier Perseguers <xavier@typo3.org>
typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php

index 400458c..8498b2d 100644 (file)
@@ -1507,7 +1507,8 @@ class ContentObjectRenderer {
                if ($linkWrap) {
                        $theValue = $this->linkWrap($theValue, $linkWrap);
                } elseif ($conf['imageLinkWrap']) {
-                       $theValue = $this->imageLinkWrap($theValue, $info['originalFile'], $conf['imageLinkWrap.']);
+                       $originalFile = !empty($info['originalFile']) ? $info['originalFile'] : $info['origFile'];
+                       $theValue = $this->imageLinkWrap($theValue, $originalFile, $conf['imageLinkWrap.']);
                }
                $wrap = isset($conf['wrap.']) ? $this->stdWrap($conf['wrap'], $conf['wrap.']) : $conf['wrap'];
                if ($wrap) {
@@ -5435,6 +5436,7 @@ class ContentObjectRenderer {
                                $theImage = $gifCreator->gifBuild();
                        }
                        $imageResource = $gifCreator->getImageDimensions($theImage);
+                       $imageResource['origFile'] = $theImage;
                } else {
                        if ($file instanceof File) {
                                $fileObject = $file;