Merge pull request #13 from nwm-dev/master

Restrict non-numeric mask fields to language of current row
Gregor-Agnes · Nov 22, 2022 · e5b7baf · e5b7baf
2 parents 1af4b45 + effc1b7
commit e5b7baf
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Classes/AdditionalContentFields.php b/Classes/AdditionalContentFields.php
@@ -77,7 +77,7 @@ public function modifyContentFromContentElement(string &$bodytext, array $ttCont
                     // it's a dependend table, index the columns from the dependent table
                     $maskColumnsOfDependentTable = preg_split('/,/', $this->getMaskFieldsFromTable($column), null, PREG_SPLIT_NO_EMPTY);
                     if ($maskColumnsOfDependentTable) {
-                        $bodytext = $this->getContentFromMaskFields($ttContentRow['pid'], $column, $maskColumnsOfDependentTable);
+                        $bodytext = $this->getContentFromMaskFields($ttContentRow['pid'], $column, $maskColumnsOfDependentTable, $ttContentRow['sys_language_uid']);
                     }
                 }
             }
@@ -90,7 +90,7 @@ public function modifyContentFromContentElement(string &$bodytext, array $ttCont
      * @param arry $columns
      * @return string
      */
-    private function getContentFromMaskFields($pid, $table, $columns)
+    private function getContentFromMaskFields($pid, $table, $columns, $sys_language_uid)
     {$queryBuilder = Db::getQueryBuilder($table);
         $pageQuery = $queryBuilder
             ->select(...$columns)
@@ -99,6 +99,10 @@ private function getContentFromMaskFields($pid, $table, $columns)
                 $queryBuilder->expr()
                     ->eq(
                         'pid', $queryBuilder->createNamedParameter($pid)
+                    ),
+                $queryBuilder->expr()
+                    ->eq(
+                        'sys_language_uid', $queryBuilder->createNamedParameter($sys_language_uid)
                     )
             )
             ->execute();