Skip to content

Commit 709a436

Browse files
committed
Remove deprecated Sphinx options
Ref: http://tracker.phpbb.com/browse/PHPBB3-13128
1 parent 47dc1f2 commit 709a436

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

search/driver/fulltext_sphinx.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -457,14 +457,12 @@ public function get_config()
457457
));
458458

459459
$searchd = array('searchd' => array(
460-
array('compat_sphinxql_magics' , '0'),
461-
array('listen' , ($this->config['fulltext_sphinx_host'] ? $this->config['fulltext_sphinx_host'] : 'localhost') . ':' . ($this->config['fulltext_sphinx_port'] ? $this->config['fulltext_sphinx_port'] : '9312')),
460+
array('listen', ($this->config['fulltext_sphinx_host'] ? $this->config['fulltext_sphinx_host'] : 'localhost') . ':' . ($this->config['fulltext_sphinx_port'] ? $this->config['fulltext_sphinx_port'] : '9312')),
462461
array('log', $this->config['fulltext_sphinx_data_path'] . 'log/searchd.log'),
463462
array('query_log', $this->config['fulltext_sphinx_data_path'] . 'log/sphinx-query.log'),
464463
array('read_timeout', '5'),
465464
array('max_children', '30'),
466465
array('pid_file', $this->config['fulltext_sphinx_data_path'] . 'searchd.pid'),
467-
array('max_matches', (string) self::MAX_MATCHES),
468466
array('binlog_path', $this->config['fulltext_sphinx_data_path']),
469467
));
470468
$data = array_merge(
@@ -501,13 +499,12 @@ protected function get_config_index_main($name)
501499
{
502500
$name = 'cdb_' . $name . '_' . $this->get_id();
503501
return array("index index_{$name}_main" => array(
504-
array('path', $this->config['fulltext_sphinx_data_path'] . "index_{$name}_main"),
502+
array('path', $this->config['fulltext_sphinx_data_path'] . "index_{$name}_main"),
505503
array('source', "source_{$name}_main"),
506504
array('docinfo', 'extern'),
507505
array('morphology', 'none'),
508-
array('stopwords', ''),
506+
array('stopwords', ''),
509507
array('min_word_len', 2),
510-
array('charset_type', 'utf-8'),
511508
array('charset_table', 'U+FF10..U+FF19->0..9, 0..9, U+FF41..U+FF5A->a..z, U+FF21..U+FF3A->a..z, A..Z->a..z, a..z, U+0149, U+017F, U+0138, U+00DF, U+00FF, U+00C0..U+00D6->U+00E0..U+00F6, U+00E0..U+00F6, U+00D8..U+00DE->U+00F8..U+00FE, U+00F8..U+00FE, U+0100->U+0101, U+0101, U+0102->U+0103, U+0103, U+0104->U+0105, U+0105, U+0106->U+0107, U+0107, U+0108->U+0109, U+0109, U+010A->U+010B, U+010B, U+010C->U+010D, U+010D, U+010E->U+010F, U+010F, U+0110->U+0111, U+0111, U+0112->U+0113, U+0113, U+0114->U+0115, U+0115, U+0116->U+0117, U+0117, U+0118->U+0119, U+0119, U+011A->U+011B, U+011B, U+011C->U+011D, U+011D, U+011E->U+011F, U+011F, U+0130->U+0131, U+0131, U+0132->U+0133, U+0133, U+0134->U+0135, U+0135, U+0136->U+0137, U+0137, U+0139->U+013A, U+013A, U+013B->U+013C, U+013C, U+013D->U+013E, U+013E, U+013F->U+0140, U+0140, U+0141->U+0142, U+0142, U+0143->U+0144, U+0144, U+0145->U+0146, U+0146, U+0147->U+0148, U+0148, U+014A->U+014B, U+014B, U+014C->U+014D, U+014D, U+014E->U+014F, U+014F, U+0150->U+0151, U+0151, U+0152->U+0153, U+0153, U+0154->U+0155, U+0155, U+0156->U+0157, U+0157, U+0158->U+0159, U+0159, U+015A->U+015B, U+015B, U+015C->U+015D, U+015D, U+015E->U+015F, U+015F, U+0160->U+0161, U+0161, U+0162->U+0163, U+0163, U+0164->U+0165, U+0165, U+0166->U+0167, U+0167, U+0168->U+0169, U+0169, U+016A->U+016B, U+016B, U+016C->U+016D, U+016D, U+016E->U+016F, U+016F, U+0170->U+0171, U+0171, U+0172->U+0173, U+0173, U+0174->U+0175, U+0175, U+0176->U+0177, U+0177, U+0178->U+00FF, U+00FF, U+0179->U+017A, U+017A, U+017B->U+017C, U+017C, U+017D->U+017E, U+017E, U+0410..U+042F->U+0430..U+044F, U+0430..U+044F, U+4E00..U+9FFF'),
512509
array('min_prefix_len', 0),
513510
array('min_infix_len', 0),
@@ -559,7 +556,6 @@ protected function get_config_source_main($name, $query, $field, $table, $extra_
559556
'),
560557
array('sql_query_post', ''),
561558
array('sql_query_post_index', $this->get_config_update_sql("titania_max_{$name}_id", '$maxid')),
562-
array('sql_query_info', 'SELECT * FROM ' . $table . ' WHERE ' . $name . '_id = $id'),
563559
), $this->get_attributes(), $extra_attributes));
564560
}
565561

0 commit comments

Comments
 (0)