diff --git a/src/Contao/View/Contao2BackendView/ContaoWidgetManager.php b/src/Contao/View/Contao2BackendView/ContaoWidgetManager.php index ce5baaf2..eec2b5ee 100644 --- 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 index 6cc9b552..3696a5bd 100644 --- 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 index 7bdee50c..ff5ee1af 100644 --- 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' )