Skip to content

[Platform.sh] Only enable Solr if parameter 'search_engine' is 'solr' #540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChrisMoutsos wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Platform.sh] Only enable Solr if parameter 'search_engine' is 'solr' #540

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
459092d
[Platform.sh] Only enable Solr if parameter 'search_engine' is 'solr'
ChrisMoutsos May 6, 2020
8b8dd88
[Platform.sh] Check env var 'SEARCH_ENGINE' instead of parameter 'sea…
ChrisMoutsos May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/packages/overrides/platformsh.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
}
}

if (isset($relationships['solr'])) {
if (isset($relationships['solr']) && ($_SERVER['SEARCH_ENGINE'] ?? false) === 'solr') {
Copy link
Member

@alongosz alongosz May 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if a defined parameter is a string, then setting bool as a fallback doesn't make any sense, even if it works

Suggested change
if (isset($relationships['solr']) && ($_SERVER['SEARCH_ENGINE'] ?? false) === 'solr') {
if (isset($relationships['solr']) && ($_SERVER['SEARCH_ENGINE'] ?? '') === 'solr') {

foreach ($relationships['solr'] as $endpoint) {
if ($endpoint['scheme'] !== 'solr') {
continue;
Expand Down