[BUGFIX] Followup to mod.SHARED.colPos_list fix 97/32697/5
authorHelmut Hummel <helmut.hummel@typo3.org>
Wed, 10 Sep 2014 08:31:05 +0000 (10:31 +0200)
committerJigal van Hemert <jigal.van.hemert@typo3.org>
Wed, 10 Sep 2014 09:56:37 +0000 (11:56 +0200)
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: Helmut Hummel <helmut.hummel@typo3.org>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Jo Hasenau <info@cybercraft.de>
Reviewed-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
Tested-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
typo3/sysext/backend/Classes/Controller/PageLayoutController.php

index 446879d..5b23734 100644 (file)
@@ -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);