aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-12-21 10:25:51 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-12-21 10:25:51 +0100
commit1a9ab15f26e95c73e8ea94b866a97ee314b2b37e (patch)
treee8b9607242b878b11c084bba642f68a2ab278f1f
parent4b890cff1248aa471cc6c181101768d6983bff1d (diff)
parentd4681145dcf03a823015173d7f58e32e913856d9 (diff)
downloadforums-1a9ab15f26e95c73e8ea94b866a97ee314b2b37e.tar
forums-1a9ab15f26e95c73e8ea94b866a97ee314b2b37e.tar.gz
forums-1a9ab15f26e95c73e8ea94b866a97ee314b2b37e.tar.bz2
forums-1a9ab15f26e95c73e8ea94b866a97ee314b2b37e.tar.xz
forums-1a9ab15f26e95c73e8ea94b866a97ee314b2b37e.zip
Merge pull request #5777 from KYPREO/ticket/16258
[ticket/16258] Fix sample Sphinx configuration file
-rw-r--r--phpBB/docs/sphinx.sample.conf4
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
{