From 1b8ae6984f16c01e6161b6ac849707b565fac955 Mon Sep 17 00:00:00 2001
From: Christer Vindberg <cvi@systime.dk>
Date: Wed, 8 Feb 2017 15:30:16 +0100
Subject: [PATCH] [BUGFIX] EXT:css_styled_content: always render all images

In CssStyledContentController::render_textpic if $accessibilityMode
evaluates to false and $separateRows is also false, $allRows is never
added to $thisImages. This causes images to not be outputted
to the frontend.

Resolves: #79687
Releases: master
Change-Id: I918741aaa8724837ef87567d481072ceedf275fa
Reviewed-on: https://review.typo3.org/51585
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Benjamin Kott <benjamin.kott@outlook.com>
Tested-by: Benjamin Kott <benjamin.kott@outlook.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
---
 .../Classes/Controller/CssStyledContentController.php         | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php b/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
index 06b0b54f301b..744c1a65b336 100644
--- a/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
+++ b/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
@@ -756,9 +756,7 @@ class CssStyledContentController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlug
                         $allRows .= $this->cObj->stdWrap($thisRow, $conf['imageRowStdWrap.']);
                     }
                 }
-                if ($separateRows) {
-                    $thisImages .= $allRows;
-                }
+                $thisImages .= $allRows;
                 $images .= $thisImages;
             }
             // Add the global caption, if not split
-- 
GitLab