Merge branch 'MDL-60838-master' of https://github.com/sammarshallou/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2017-11-28 20:48:15 +01:00
commit 8000e6af01

View File

@ -1227,6 +1227,9 @@ class engine extends \core_search\engine {
}
}
// Set timeout as for Solr client.
$options['CURLOPT_TIMEOUT'] = !empty($this->config->server_timeout) ? $this->config->server_timeout : '30';
$this->curl->setopt($options);
if (!empty($this->config->server_username) && !empty($this->config->server_password)) {