Restore append core name to path and remove cloud comment

This commit is contained in:
Beatrycze Volk 2020-12-08 16:33:51 +01:00
parent dc758aebf1
commit 5b3eac3a29
1 changed files with 2 additions and 2 deletions

View File

@ -247,6 +247,8 @@ class Solr
$solrInfo['password'] = $conf['solrPass'];
// Set port if not set.
$solrInfo['port'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($conf['solrPort'], 1, 65535, 8983);
// Append core name to path.
$solrInfo['path'] = trim($conf['solrPath'], '/') . '/solr';
// Timeout
$solrInfo['timeout'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($conf['solrTimeout'], 1, intval(ini_get('max_execution_time')), 10);
return $solrInfo;
@ -578,8 +580,6 @@ class Solr
'port' => $solrInfo['port'],
'path' => '/',
'core' => $core,
// For Solr Cloud you need to provide a collection instead of core:
// 'collection' => $core
'username' => $solrInfo['username'],
'password' => $solrInfo['password'],
'timeout' => $solrInfo['timeout']