makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix topic title only and first post search option with the SQL_CALC_FOUND_ROWS fix

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9472 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-04-18 17:42:31 +00:00
parent 7b07476207
commit eb49218428
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/search/fulltext_native.php
View file

@ -650,12 +650,8 @@ class fulltext_native extends search_backend
case 'mysql4': case 'mysql4':
case 'mysqli': case 'mysqli':
$sql_array_copy = $sql_array;
// 3.x does not support SQL_CALC_FOUND_ROWS // 3.x does not support SQL_CALC_FOUND_ROWS
// $sql_array['SELECT'] = 'SQL_CALC_FOUND_ROWS ' . $sql_array['SELECT']; // $sql_array['SELECT'] = 'SQL_CALC_FOUND_ROWS ' . $sql_array['SELECT'];
$sql_array_copy['SELECT'] = 'SQL_CALC_FOUND_ROWS p.post_id ';
$is_mysql = true; $is_mysql = true;
break; break;
@ -707,7 +703,7 @@ class fulltext_native extends search_backend
if ($left_join_topics) if ($left_join_topics)
{ {
$sql_array['LEFT_JOIN'][$left_join_topics] = array( $sql_array['LEFT_JOIN'][] = array(
'FROM' => array(TOPICS_TABLE => 't'), 'FROM' => array(TOPICS_TABLE => 't'),
'ON' => 'p.topic_id = t.topic_id' 'ON' => 'p.topic_id = t.topic_id'
); );
@ -734,8 +730,12 @@ class fulltext_native extends search_backend
} }
// if we use mysql and the total result count is not cached yet, retrieve it from the db // if we use mysql and the total result count is not cached yet, retrieve it from the db
if (!$total_results && $is_mysql && !empty($sql_array_copy)) if (!$total_results && $is_mysql)
{ {
// Count rows for the executed queries. Replace $select within $sql with SQL_CALC_FOUND_ROWS, and run it.
$sql_array_copy = $sql_array;
$sql_array_copy['SELECT'] = 'SQL_CALC_FOUND_ROWS p.post_id ';
$sql = $db->sql_build_query('SELECT', $sql_array_copy); $sql = $db->sql_build_query('SELECT', $sql_array_copy);
unset($sql_array_copy); unset($sql_array_copy);