Commit 20de0fc4 authored by Helmut Hummel's avatar Helmut Hummel Committed by Jigal van Hemert
Browse files

[BUGFIX] Followup to mod.SHARED.colPos_list fix

The internal property activeColPosList is intermediately
set to an array and not converted to a comma separated list
any more, which breaks related code.

Resolves: #39967
Releases: 6.2, 6.3
Change-Id: I6f2e4710174ad5277f9de47c2d7b2cbb7a5ebb80
Reviewed-on: http://review.typo3.org/32697


Reviewed-by: default avatarHelmut Hummel <helmut.hummel@typo3.org>
Tested-by: default avatarHelmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Nicole Cordes's avatarNicole Cordes <typo3@cordes.co>
Reviewed-by: Jo Hasenau's avatarJo Hasenau <info@cybercraft.de>
Reviewed-by: Jigal van Hemert's avatarJigal van Hemert <jigal.van.hemert@typo3.org>
Tested-by: Jigal van Hemert's avatarJigal van Hemert <jigal.van.hemert@typo3.org>
parent c8ce27ca
......@@ -543,14 +543,13 @@ class PageLayoutController {
if (trim($this->modSharedTSconfig['properties']['colPos_list']) !== '') {
$this->activeColPosList = array_unique(GeneralUtility::intExplode(',', trim($this->modSharedTSconfig['properties']['colPos_list'])));
// Match with the list which is present in the colPosList for the current page
if (!empty($this->colPosList) && !empty($this->colActivePosList)) {
$this->activeColPosList = implode(',', array_unique(array_intersect(
if (!empty($this->colPosList) && !empty($this->activeColPosList)) {
$this->activeColPosList = array_unique(array_intersect(
$this->activeColPosList,
$this->colPosList
)));
));
}
} else {
$this->activeColPosList = implode(',', $this->colPosList);
$this->activeColPosList = implode(',', $this->activeColPosList);
}
$this->colPosList = implode(',', $this->colPosList);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment