[BUGFIX] CategoryRegistry::addTcaColumn() ignores displayCond 57/46057/3
authorTomita Militaru <tmilitaru@arxia.com>
Mon, 18 Jan 2016 12:55:22 +0000 (14:55 +0200)
committerBenni Mack <benni@typo3.org>
Fri, 29 Jan 2016 22:12:20 +0000 (23:12 +0100)
Adds check for displayCond and include it if present.

Resolves: #70307
Releases: master, 7.6, 6.2
Change-Id: I94b61bd2f098b279745028731b8392a9bf3389b2
Reviewed-on: https://review.typo3.org/46057
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Markus Sommer <markussom@posteo.de>
Tested-by: Markus Sommer <markussom@posteo.de>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
typo3/sysext/core/Classes/Category/CategoryRegistry.php

index 2d7e621..d941015 100644 (file)
@@ -357,6 +357,9 @@ class CategoryRegistry implements SingletonInterface
             if (isset($options['l10n_display'])) {
                 $columns[$fieldName]['l10n_display'] = $options['l10n_display'];
             }
+            if (isset($options['displayCond'])) {
+                $columns[$fieldName]['displayCond'] = $options['displayCond'];
+            }
 
             // Register opposite references for the foreign side of a relation
             if (empty($GLOBALS['TCA']['sys_category']['columns']['items']['config']['MM_oppositeUsage'][$tableName])) {