diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-12-21 10:25:56 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-12-21 10:25:56 +0100 |
| commit | 0b3eb2f9eaac66cf76e40703f77f362d1e42e86c (patch) | |
| tree | f204fb9e37186f8cacac010c0afb0d00d4e1cc06 | |
| parent | 581139ab1551abfbb6b96c025f34dc7c2cc329c2 (diff) | |
| parent | 1a9ab15f26e95c73e8ea94b866a97ee314b2b37e (diff) | |
| download | forums-0b3eb2f9eaac66cf76e40703f77f362d1e42e86c.tar forums-0b3eb2f9eaac66cf76e40703f77f362d1e42e86c.tar.gz forums-0b3eb2f9eaac66cf76e40703f77f362d1e42e86c.tar.bz2 forums-0b3eb2f9eaac66cf76e40703f77f362d1e42e86c.tar.xz forums-0b3eb2f9eaac66cf76e40703f77f362d1e42e86c.zip | |
Merge branch '3.2.x' into 3.3.x
| -rw-r--r-- | phpBB/docs/sphinx.sample.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf index 85cba190d7..bf7c4a43a8 100644 --- a/phpBB/docs/sphinx.sample.conf +++ b/phpBB/docs/sphinx.sample.conf @@ -41,7 +41,7 @@ source source_phpbb_{SPHINX_ID}_main } source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main { - sql_query_pre = + sql_query_pre = SET NAMES 'utf8' sql_query_range = sql_range_step = sql_query = SELECT \ @@ -61,7 +61,7 @@ source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main WHERE \ p.topic_id = t.topic_id \ AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) - sql_query_pre = + sql_query_post_index = } index index_phpbb_{SPHINX_ID}_main { |