Fix for PHPCQ

contao-community-alliance · Nov 20, 2024 · ab4ab68 · ab4ab68
1 parent 077dc1d
commit ab4ab68
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/Contao/View/Contao2BackendView/ContaoWidgetManager.php b/src/Contao/View/Contao2BackendView/ContaoWidgetManager.php
@@ -431,7 +431,7 @@ public function renderWidget($property, $ignoreErrors = false, PropertyValueBagI
             ->set('strDatepicker', $isHideInput ? null : $this->getDatePicker($propInfo->getExtra(), $widget))
             // We used the var blnUpdate before.
             ->set('blnUpdate', false)
-            ->set('strHelp', $isHideInput ? null : $this->generateHelpText($property, $widget))
+            ->set('strHelp', $isHideInput ? '' : $this->generateHelpText($property, $widget))
             ->set('strId', $widget->id)
             ->set('isHideInput', $isHideInput)
             ->set('hiddenName', $widget->name)

diff --git a/src/Contao/View/Contao2BackendView/Widget/FileTree.php b/src/Contao/View/Contao2BackendView/Widget/FileTree.php
@@ -331,6 +331,9 @@ private function renderList(array &$icons, Collection $collection = null, bool $
 
             if (('folder' === $model->type) && $followSubDirs) {
                 $files = FilesModel::findByPid($uuid);
+                if (null === $files) {
+                    continue;
+                }
                 assert($files instanceof Collection);
                 $this->renderList($icons, $files);
                 continue;

diff --git a/src/Controller/BackendTreeController.php b/src/Controller/BackendTreeController.php
@@ -182,7 +182,7 @@ private function runBackendTree(Request $request)
                 'title',
                 StringUtil::specialchars(
                     $this->getTranslator()->trans(
-                        'treepicker',
+                        'treePicker',
                         ['%table%' => $treeSelector->foreignTable],
                         'dc-general'
                     )