Compare commits

...

6 Commits

Author SHA1 Message Date
Guy Sartorelli 0f62997e70
Merge branch '4.0' into 4 2023-08-29 10:31:28 +12:00
Guy Sartorelli cf24b84ad1
Merge branch '3' into 4.0 2023-08-29 10:31:18 +12:00
Guy Sartorelli 23f9210918
Merge branch '3.12' into 3 2023-08-29 10:28:05 +12:00
Guy Sartorelli 47a2a1e1a8
ENH Update translations (#352) 2023-08-21 12:51:35 +12:00
Guy Sartorelli 8ef542d4e4
Merge pull request #351 from LeviWB/fix/remove-undefined-method
FIX Remove call to process::inheritEnvironmentVariables()
2023-08-10 11:26:45 +12:00
Levi Wilson-Brown 526ee734be FIX Remove call to process::inheritEnvironmentVariables()
inheritEnvironmentVariables() was removed from the Symfony Process component in 5.0.0, as enviroment variables are always inherited.
2023-08-09 18:18:54 +12:00
2 changed files with 4 additions and 5 deletions

View File

@ -3,12 +3,12 @@ fi:
GO: Hae
SEARCH: Haku
SolrResultsPage:
SearchQuery: 'Hakusanasi oli'
DidYouMean: Tarkoititko
ReadMore: 'Lue lisää'
NoResults: 'Pahoittelut, mutta hakusi ei tuottanut yhtään osumaa.'
Page: Sivu
of: /
ViewPreviousPage: 'Katso edellinen sivu'
ReadMore: 'Lue lisää'
SearchQuery: 'Hakusanasi oli'
'View page number': 'Siirry sivulle'
ViewNextPage: 'Katso seuraava sivu'
ViewPreviousPage: 'Katso edellinen sivu'
of: /

View File

@ -104,7 +104,6 @@ class SolrReindexImmediateHandler extends SolrReindexBase
// Set timeout from config. Process default is 60 seconds
$process->setTimeout($this->config()->get('process_timeout'));
$process->inheritEnvironmentVariables();
$process->run();
$res = $process->getOutput();