Merge branch '3.9' into 3

This commit is contained in:
Steve Boyd 2022-03-04 14:12:42 +13:00
commit fad7c0421c

View File

@ -79,12 +79,6 @@ class SolrReindexImmediateHandler extends SolrReindexBase
// Build script parameters // Build script parameters
$statevar = json_encode($state); $statevar = json_encode($state);
if (strpos(PHP_OS, "WIN") !== false) {
$statevar = '"' . str_replace('"', '\\"', $statevar) . '"';
} else {
$statevar = "'" . $statevar . "'";
}
$php = Environment::getEnv('SS_PHP_BIN') ?: Config::inst()->get(static::class, 'php_bin'); $php = Environment::getEnv('SS_PHP_BIN') ?: Config::inst()->get(static::class, 'php_bin');
// Build script line // Build script line