diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-06-08 01:59:09 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-06-08 01:59:09 +0200 |
| commit | 03bfcba582965e69c42b75d3a0ebd0d0834e1f7e (patch) | |
| tree | ff004603f5a70ad03e7a6c59b269fb0d5220732b /phpBB/phpbb/search/fulltext_native.php | |
| parent | 9777abaed465d08bb8018661d210c2d92ae4870e (diff) | |
| parent | f94bbcb4fe16ec70e184977ffbf1f39d47447f5f (diff) | |
| download | forums-03bfcba582965e69c42b75d3a0ebd0d0834e1f7e.tar forums-03bfcba582965e69c42b75d3a0ebd0d0834e1f7e.tar.gz forums-03bfcba582965e69c42b75d3a0ebd0d0834e1f7e.tar.bz2 forums-03bfcba582965e69c42b75d3a0ebd0d0834e1f7e.tar.xz forums-03bfcba582965e69c42b75d3a0ebd0d0834e1f7e.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13888] Fix sql_freeresult() error on author searches
Diffstat (limited to 'phpBB/phpbb/search/fulltext_native.php')
| -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 42ad97da30..dab097a376 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -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'; |