Merge branch 'MDL-53412-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 00:57:22 +0000 (08:57 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 00:57:22 +0000 (08:57 +0800)
1  2 
search/engine/solr/classes/engine.php
search/engine/solr/tests/engine_test.php

@@@ -453,14 -422,12 +458,13 @@@ class engine extends \core_search\engin
              'login'    => !empty($this->config->server_username) ? $this->config->server_username : '',
              'password' => !empty($this->config->server_password) ? $this->config->server_password : '',
              'port'     => !empty($this->config->server_port) ? $this->config->server_port : '',
-             'issecure' => !empty($this->config->secure) ? $this->config->secure : '',
+             'secure' => !empty($this->config->secure) ? true : false,
              'ssl_cert' => !empty($this->config->ssl_cert) ? $this->config->ssl_cert : '',
-             'ssl_cert_only' => !empty($this->config->ssl_cert_only) ? $this->config->ssl_cert_only : '',
              'ssl_key' => !empty($this->config->ssl_key) ? $this->config->ssl_key : '',
-             'ssl_password' => !empty($this->config->ssl_keypassword) ? $this->config->ssl_keypassword : '',
+             'ssl_keypassword' => !empty($this->config->ssl_keypassword) ? $this->config->ssl_keypassword : '',
              'ssl_cainfo' => !empty($this->config->ssl_cainfo) ? $this->config->ssl_cainfo : '',
              'ssl_capath' => !empty($this->config->ssl_capath) ? $this->config->ssl_capath : '',
 +            'timeout' => !empty($this->config->server_timeout) ? $this->config->server_timeout : '30'
          );
  
          $this->client = new \SolrClient($options);