Merge branch '3.2.x'

* 3.2.x:
  [ticket/14782] Use the $select variable in "Your Posts" search
This commit is contained in:
Andreas Fischer 2016-09-15 19:30:55 +02:00
commit 4c54237e3e

View file

@ -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);