diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-11-17 09:56:51 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-11-17 09:56:51 +0100 |
| commit | 9343317121504ef6b558f81126ce93adb6f33ecd (patch) | |
| tree | 272aa875857cad890a8433f4947d9090ffb6987c /phpBB/phpbb/search/fulltext_native.php | |
| parent | c6bed98cf508f4dfd6e0ec1762768b238a1c6ee3 (diff) | |
| parent | e974f338afb86c065e9b160363bc2e6156f8566d (diff) | |
| download | forums-9343317121504ef6b558f81126ce93adb6f33ecd.tar forums-9343317121504ef6b558f81126ce93adb6f33ecd.tar.gz forums-9343317121504ef6b558f81126ce93adb6f33ecd.tar.bz2 forums-9343317121504ef6b558f81126ce93adb6f33ecd.tar.xz forums-9343317121504ef6b558f81126ce93adb6f33ecd.zip | |
Merge remote-tracking branch 'senky/ticket/14739' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/search/fulltext_native.php')
| -rw-r--r-- | phpBB/phpbb/search/fulltext_native.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php index 580d9b6878..2071a973e5 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -878,7 +878,6 @@ class fulltext_native extends \phpbb\search\base break; - case 'sqlite': case 'sqlite3': $sql_array_count['SELECT'] = ($type == 'posts') ? 'DISTINCT p.post_id' : 'DISTINCT p.topic_id'; $sql = 'SELECT COUNT(' . (($type == 'posts') ? 'post_id' : 'topic_id') . ') as total_results @@ -1185,7 +1184,7 @@ class fulltext_native extends \phpbb\search\base } else { - if ($this->db->get_sql_layer() == 'sqlite' || $this->db->get_sql_layer() == 'sqlite3') + if ($this->db->get_sql_layer() == 'sqlite3') { $sql = 'SELECT COUNT(topic_id) as total_results FROM (SELECT DISTINCT t.topic_id'; @@ -1202,7 +1201,7 @@ class fulltext_native extends \phpbb\search\base $post_visibility $sql_fora AND t.topic_id = p.topic_id - $sql_time" . (($this->db->get_sql_layer() == 'sqlite' || $this->db->get_sql_layer() == 'sqlite3') ? ')' : ''); + $sql_time" . ($this->db->get_sql_layer() == 'sqlite3' ? ')' : ''); } $result = $this->db->sql_query($sql); @@ -1667,7 +1666,6 @@ class fulltext_native extends \phpbb\search\base { switch ($this->db->get_sql_layer()) { - case 'sqlite': case 'sqlite3': $this->db->sql_query('DELETE FROM ' . SEARCH_WORDLIST_TABLE); $this->db->sql_query('DELETE FROM ' . SEARCH_WORDMATCH_TABLE); |