1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-22 10:57:56 +01:00

Merge branch '3.1.x'

* 3.1.x:
  [ticket/13888] Fix sql_freeresult() error on author searches
This commit is contained in:
Andreas Fischer 2015-06-08 01:59:09 +02:00
commit 03bfcba582

View File

@ -1078,7 +1078,7 @@ class fulltext_native extends \phpbb\search\base
// 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);
$this->db->sql_query($sql_calc);
$result = $this->db->sql_query($sql_calc);
$this->db->sql_freeresult($result);
$sql_count = 'SELECT FOUND_ROWS() as total_results';