Skip to content

Commit

Permalink
[BUGFIX] Keep the original value for "loadFlexformsFromOtherCE", fixes
Browse files Browse the repository at this point in the history
…#142

After merging the FlexForm configurations of the
two content elements we need to make sure the
value for "loadFlexformsFromOtherCE" is set back to
the original value because it may happen that in
the search box plugin that FlexForm value is an
empty value which would override the original value.
That can happen if the content element was first set
to "result list" and then changed to "search box".
Then we would have an empty value for
"loadFlexformsFromOtherCE".
  • Loading branch information
christianbltr committed Oct 27, 2023
1 parent e64d6f9 commit 39f45f0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
ChangeLog

Version 5.1.2, 27 October 2023
[BUGFIX] Keep the original value for "loadFlexformsFromOtherCE" even if the search box plugin has an empty value in the FlexForm which lead to empty search results, thanks to Uwe Hawkeye1909, https://github.com/tpwd/ke_search/issues/142

Version 5.1.1, 27 October 2023
[BUGFIX] Fix regression introduced in 5.1.0 (search was always empty), https://github.com/tpwd/ke_search/issues/195

Expand Down
7 changes: 7 additions & 0 deletions Classes/Lib/Pluginbase.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,13 @@ public function init()
}
$this->cObj->data['pi_flexform'] = $contentElement['pi_flexform'];
$flexFormConfiguration = array_merge($currentFlexFormConfiguration, $this->getFlexFormConfiguration());

// After merging the FlexForm configurations of the two content elements we need to make sure the
// value for "loadFlexformsFromOtherCE" is set back to the original value because it may happen that
// in the search box plugin that FlexForm value is an empty value which would override the original value.
// That can happen if the content element was first set to "result list" and then changed to "search box".
// Then we would have an empty value for "loadFlexformsFromOtherCE".
$this->conf['loadFlexformsFromOtherCE'] = $loadFlexformsFromOtherCE;
}

// make settings from FlexForm available in general configuration ($this->conf)
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
'title' => 'Faceted Search',
'description' => 'Faceted fulltext search for TYPO3. Fast, flexible and easy to install and use. Indexes content directly from the databases. Features faceting / filtering, file indexing, images in result lists and respects access restrictions.',
'category' => 'plugin',
'version' => '5.1.1',
'version' => '5.1.2',
'state' => 'stable',
'author' => 'ke_search Dev Team',
'author_email' => 'ke_search@tpwd.de',
Expand Down

0 comments on commit 39f45f0

Please sign in to comment.