1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-16 04:19:41 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2019-12-21 10:26:00 +01:00
commit 7e450a4728
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -41,7 +41,7 @@ source source_phpbb_{SPHINX_ID}_main
} }
source source_phpbb_{SPHINX_ID}_delta : 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_query_range =
sql_range_step = sql_range_step =
sql_query = SELECT \ sql_query = SELECT \
@ -61,7 +61,7 @@ source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main
WHERE \ WHERE \
p.topic_id = t.topic_id \ p.topic_id = t.topic_id \
AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) 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 index index_phpbb_{SPHINX_ID}_main
{ {