Patch for TYPO3's EXT:vhs issue #693

diff --git a/www/typo3conf/ext/vhs/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php b/www/typo3conf/ext/vhs/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php
index 8deb4aa..cae458a 100644
--- a/www/typo3conf/ext/vhs/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php
+++ b/www/typo3conf/ext/vhs/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php
@@ -117,7 +117,13 @@ abstract class Tx_Vhs_ViewHelpers_Media_Image_AbstractImageViewHelper extends Tx
        }
        $this->imageInfo[3] = \TYPO3\CMS\Core\Utility\GeneralUtility::png_to_gif_by_imagemagick($this->imageInfo[3]);
        $GLOBALS['TSFE']->imagesOnPage[] = $this->imageInfo[3];
-       $this->mediaSource = $GLOBALS['TSFE']->absRefPrefix . \TYPO3\CMS\Core\Utility\GeneralUtility::rawUrlEncodeFP($this->imageInfo[3]);
+       $imagePublicUrl = $this->imageInfo[3];
+       if (strpos($imagePublicUrl, '%') === FALSE) {
+           // $this->imageInfo[3] may contain encoded or unencoded URL depending on whether it comes from the FAL or from the "import"ed image.
+           // Do not double-encode in case of FAL.
+           $imagePublicUrl = \TYPO3\CMS\Core\Utility\GeneralUtility::rawUrlEncodeFP($this->imageInfo[3]);
+       }
+       $this->mediaSource = $GLOBALS['TSFE']->absRefPrefix . $imagePublicUrl;
        if (TYPO3_MODE === 'BE') {
            $this->resetFrontendEnvironment();
        }