diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2012-07-12 04:28:55 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2012-07-19 23:01:47 +0530 |
| commit | 118b57f71d9f563f8eeda8e5925d482c38ab1af8 (patch) | |
| tree | d4ae2aa57ec98d0fb69e1f05962250db4830966c | |
| parent | 13c451ca2e9a6717a8a98943ba022a6f41dcdd9c (diff) | |
| download | forums-118b57f71d9f563f8eeda8e5925d482c38ab1af8.tar forums-118b57f71d9f563f8eeda8e5925d482c38ab1af8.tar.gz forums-118b57f71d9f563f8eeda8e5925d482c38ab1af8.tar.bz2 forums-118b57f71d9f563f8eeda8e5925d482c38ab1af8.tar.xz forums-118b57f71d9f563f8eeda8e5925d482c38ab1af8.zip | |
[feature/sphinx-fulltext-search] minor changes in sphinx.conf
PHPBB3-10946
| -rw-r--r-- | phpBB/docs/sphinx.sample.conf | 4 | ||||
| -rw-r--r-- | phpBB/includes/search/fulltext_sphinx.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf index 06595a766f..eaef081aa1 100644 --- a/phpBB/docs/sphinx.sample.conf +++ b/phpBB/docs/sphinx.sample.conf @@ -6,6 +6,8 @@ source source_phpbb_{SPHINX_ID}_main sql_pass = password sql_db = db_name sql_port = 3306 #optional, default is 3306 + sql_query_pre = SET NAMES 'utf8' + sql_query_pre = REPLACE INTO phpbb_sphinx SELECT 1, MAX(post_id) FROM phpbb_posts sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts sql_range_step = 5000 sql_query = SELECT
\ @@ -27,8 +29,6 @@ source source_phpbb_{SPHINX_ID}_main sql_query_post = sql_query_post_index = REPLACE INTO phpbb_sphinx ( counter_id, max_doc_id ) VALUES ( 1, $maxid ) sql_query_info = SELECT * FROM phpbb_posts WHERE post_id = $id - sql_query_pre = SET NAMES utf8 - sql_query_pre = REPLACE INTO phpbb_sphinx SELECT 1, MAX(post_id) FROM phpbb_posts sql_attr_uint = forum_id sql_attr_uint = topic_id sql_attr_uint = poster_id diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php index 747c22a3ef..c223284c72 100644 --- a/phpBB/includes/search/fulltext_sphinx.php +++ b/phpBB/includes/search/fulltext_sphinx.php @@ -150,7 +150,7 @@ class phpbb_search_fulltext_sphinx array('sql_pass', $dbpasswd), array('sql_db', $dbname), array('sql_port', $dbport), - array('sql_query_pre', 'SET NAMES utf8'), + array('sql_query_pre', 'SET NAMES \'utf8\''), array('sql_query_pre', 'REPLACE INTO ' . SPHINX_TABLE . ' SELECT 1, MAX(post_id) FROM ' . POSTS_TABLE . ''), array('sql_query_range', 'SELECT MIN(post_id), MAX(post_id) FROM ' . POSTS_TABLE . ''), array('sql_range_step', '5000'), |