Commit 6a389870 authored by Jigal van Hemert's avatar Jigal van Hemert Committed by Helmut Hummel
Browse files

[BUGFIX] Followup 2 to mod.SHARED.colPos_list fix

Deal with empty mod.SHARED and fill activeColPosList with colPosList
in case the TSconfig setting is empty.

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


Reviewed-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: default avatarHelmut Hummel <helmut.hummel@typo3.org>
Tested-by: default avatarHelmut Hummel <helmut.hummel@typo3.org>
parent ec316472
......@@ -540,7 +540,7 @@ class PageLayoutController {
// Removing duplicates, if any
$this->colPosList = array_unique(GeneralUtility::intExplode(',', $this->colPosList));
// Accessible columns
if (trim($this->modSharedTSconfig['properties']['colPos_list']) !== '') {
if (isset($this->modSharedTSconfig['properties']['colPos_list']) && 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->activeColPosList)) {
......@@ -549,8 +549,10 @@ class PageLayoutController {
$this->colPosList
));
}
$this->activeColPosList = implode(',', $this->activeColPosList);
} else {
$this->activeColPosList = $this->colPosList;
}
$this->activeColPosList = implode(',', $this->activeColPosList);
$this->colPosList = implode(',', $this->colPosList);
// Page title
......
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