diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2016-09-15 19:30:44 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2016-09-15 19:30:44 +0200 |
| commit | 271e8b43f9c46385a799cc3ff1bf86e7ea66efbe (patch) | |
| tree | a5f0dd0421fe876ce7be51a2a7d196795ac031ff /phpBB/phpbb | |
| parent | 142f937354f4324cfd0bd1b2d991a3886ba1d464 (diff) | |
| parent | 32ba128ea55a6ff5aa10277b4164d7dca740dfaa (diff) | |
| download | forums-271e8b43f9c46385a799cc3ff1bf86e7ea66efbe.tar forums-271e8b43f9c46385a799cc3ff1bf86e7ea66efbe.tar.gz forums-271e8b43f9c46385a799cc3ff1bf86e7ea66efbe.tar.bz2 forums-271e8b43f9c46385a799cc3ff1bf86e7ea66efbe.tar.xz forums-271e8b43f9c46385a799cc3ff1bf86e7ea66efbe.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14782] Use the $select variable in "Your Posts" search
Diffstat (limited to 'phpBB/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 0fec092d52..63c17b6ded 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 p.post_id', $sql); + $sql_calc = str_replace('SELECT ' . $select, 'SELECT DISTINCT SQL_CALC_FOUND_ROWS ' . $select, $sql); $result = $this->db->sql_query($sql_calc); $this->db->sql_freeresult($result); |