Skip to content

Commit

Permalink
Merge branch 'release/4.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonas Hirschi committed Sep 5, 2023
2 parents 7fc6018 + 09335af commit 60942b2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Classes/Controller/FormEntryController.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ public function exportAction(\Frappant\FrpFormAnswers\Domain\Model\FormEntryDema
$this->redirect('list');
}

$extensionConfiguration = $GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['frp_formanswers'];
$exportData = $this->dataExporter->getExport($formEntries, $formEntryDemand, $extensionConfiguration['useSubmitUid']['value']);
$extensionConfiguration = $GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['frp_formanswers'] ?? null;
$exportData = $this->dataExporter->getExport($formEntries, $formEntryDemand, $extensionConfiguration['useSubmitUid']['value'] ?? false);

$this->formEntryRepository->setFormsToExported($formEntries);

Expand Down
4 changes: 2 additions & 2 deletions Classes/Utility/FormAnswersUtility.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ public function prepareFormAnswersArray()
// Get all Pids with a formEntry list
foreach ($startPointPids as $pageId) {
foreach ($this->formEntryRepository->findAllInPidAndRootline($pageId) as $formEntry) {
if($pageIds[$formEntry->getPid()][$formEntry->getForm()]['tot']) {
if(isset($pageIds[$formEntry->getPid()][$formEntry->getForm()]['tot'])) {
$pageIds[$formEntry->getPid()][$formEntry->getForm()]['tot'] += 1;
} else {
$pageIds[$formEntry->getPid()][$formEntry->getForm()]['tot'] = 1;
}

if (!$formEntry->isExported()) {
if($pageIds[$formEntry->getPid()][$formEntry->getForm()]['new']) {
if(isset($pageIds[$formEntry->getPid()][$formEntry->getForm()]['new'])) {
$pageIds[$formEntry->getPid()][$formEntry->getForm()]['new'] += 1;
} else {
$pageIds[$formEntry->getPid()][$formEntry->getForm()]['new'] = 1;
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
'uploadfolder' => '0',
'createDirs' => '',
'clearCacheOnLoad' => 0,
'version' => '4.0.3',
'version' => '4.1.0',
'constraints' => [
'depends' => [
'typo3' => '11.3.0-11.5.99',
Expand Down

0 comments on commit 60942b2

Please sign in to comment.