diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-08 19:17:46 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-08 19:17:46 -0600 |
| commit | 7880a87c5ed8a83c835ec485a1dce9ce2d4a65d7 (patch) | |
| tree | 3912c2115e4e998fe7e550b182b2c772fe592596 | |
| parent | 4fb19c85416767b04cfaa13df1c87a10d5a9f616 (diff) | |
| parent | 8290dd6b1ce9051b774ad42ae633fbbbbaeb199b (diff) | |
| download | forums-7880a87c5ed8a83c835ec485a1dce9ce2d4a65d7.tar forums-7880a87c5ed8a83c835ec485a1dce9ce2d4a65d7.tar.gz forums-7880a87c5ed8a83c835ec485a1dce9ce2d4a65d7.tar.bz2 forums-7880a87c5ed8a83c835ec485a1dce9ce2d4a65d7.tar.xz forums-7880a87c5ed8a83c835ec485a1dce9ce2d4a65d7.zip | |
Merge pull request #2094 from dhruvgoel92/ticket/11938
[ticket/11938] remove deprecated sql_attr_str2ordinal and use sql_attr_string
| -rw-r--r-- | phpBB/docs/sphinx.sample.conf | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/search/fulltext_sphinx.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf index 620ec25761..0a210ecd1a 100644 --- a/phpBB/docs/sphinx.sample.conf +++ b/phpBB/docs/sphinx.sample.conf @@ -38,7 +38,7 @@ source source_phpbb_{SPHINX_ID}_main sql_attr_bool = deleted sql_attr_timestamp = post_time sql_attr_timestamp = topic_last_post_time - sql_attr_str2ordinal = post_subject + sql_attr_string = post_subject } source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main { diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php index acbfad9474..d86a394326 100644 --- a/phpBB/phpbb/search/fulltext_sphinx.php +++ b/phpBB/phpbb/search/fulltext_sphinx.php @@ -282,9 +282,9 @@ class fulltext_sphinx array('sql_attr_uint', 'post_visibility'), array('sql_attr_bool', 'topic_first_post'), array('sql_attr_bool', 'deleted'), - array('sql_attr_timestamp' , 'post_time'), - array('sql_attr_timestamp' , 'topic_last_post_time'), - array('sql_attr_str2ordinal', 'post_subject'), + array('sql_attr_timestamp', 'post_time'), + array('sql_attr_timestamp', 'topic_last_post_time'), + array('sql_attr_string', 'post_subject'), ), 'source source_phpbb_' . $this->id . '_delta : source_phpbb_' . $this->id . '_main' => array( array('sql_query_pre', ''), |