diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-09-17 00:05:09 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-09-17 00:05:09 +0200 |
| commit | 2dbc9e10169879d3dea1aed6aaafbcd29a86784e (patch) | |
| tree | 52003290e8665afe4d2ab97ec6c8fba8cd9ac310 /phpBB | |
| parent | 271e8b43f9c46385a799cc3ff1bf86e7ea66efbe (diff) | |
| parent | 33584f12f0c717e18f47a77e13df57a0905dae8c (diff) | |
| download | forums-2dbc9e10169879d3dea1aed6aaafbcd29a86784e.tar forums-2dbc9e10169879d3dea1aed6aaafbcd29a86784e.tar.gz forums-2dbc9e10169879d3dea1aed6aaafbcd29a86784e.tar.bz2 forums-2dbc9e10169879d3dea1aed6aaafbcd29a86784e.tar.xz forums-2dbc9e10169879d3dea1aed6aaafbcd29a86784e.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/search/fulltext_native.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php index 63c17b6ded..580d9b6878 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -1261,7 +1261,7 @@ class fulltext_native extends \phpbb\search\base if (!$total_results && $is_mysql) { // Count rows for the executed queries. Replace $select within $sql with SQL_CALC_FOUND_ROWS, and run it. - $sql_calc = str_replace('SELECT ' . $select, 'SELECT DISTINCT SQL_CALC_FOUND_ROWS ' . $select, $sql); + $sql_calc = str_replace('SELECT ' . $select, 'SELECT SQL_CALC_FOUND_ROWS ' . $select, $sql); $result = $this->db->sql_query($sql_calc); $this->db->sql_freeresult($result); |