diff options
| author | Nils Adermann <naderman@naderman.de> | 2008-06-04 17:28:43 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2008-06-04 17:28:43 +0000 |
| commit | 443ec9dcb06755eb4ee758bb34e2e7ea72c051ae (patch) | |
| tree | 612dff83a8e90a4b371682fc779f3f802aa3fb78 /phpBB/includes/search | |
| parent | e08a400b9f504373541725b93aed6f0270a8caa6 (diff) | |
| download | forums-443ec9dcb06755eb4ee758bb34e2e7ea72c051ae.tar forums-443ec9dcb06755eb4ee758bb34e2e7ea72c051ae.tar.gz forums-443ec9dcb06755eb4ee758bb34e2e7ea72c051ae.tar.bz2 forums-443ec9dcb06755eb4ee758bb34e2e7ea72c051ae.tar.xz forums-443ec9dcb06755eb4ee758bb34e2e7ea72c051ae.zip | |
merging r8604 into trunk
git-svn-id: file:///svn/phpbb/trunk@8606 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/search')
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/search/fulltext_native.php | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index 17cc6782c5..826ec9d4a1 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -465,8 +465,8 @@ class fulltext_mysql extends search_backend break; case 't': - $sql_sort_table = ($type == 'posts') ? TOPICS_TABLE . ' t, ' : ''; - $sql_sort_join = ($type == 'posts') ? ' AND t.topic_id = p.topic_id ' : ''; + $sql_sort_table = ($type == 'posts' && !$firstpost_only) ? TOPICS_TABLE . ' t, ' : ''; + $sql_sort_join = ($type == 'posts' && !$firstpost_only) ? ' AND t.topic_id = p.topic_id ' : ''; break; case 'f': diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index 48a29e4f31..5d17ca4fdc 100644 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -807,8 +807,8 @@ class fulltext_native extends search_backend break; case 't': - $sql_sort_table = ($type == 'posts') ? TOPICS_TABLE . ' t, ' : ''; - $sql_sort_join = ($type == 'posts') ? ' AND t.topic_id = p.topic_id ' : ''; + $sql_sort_table = ($type == 'posts' && !$firstpost_only) ? TOPICS_TABLE . ' t, ' : ''; + $sql_sort_join = ($type == 'posts' && !$firstpost_only) ? ' AND t.topic_id = p.topic_id ' : ''; break; case 'f': @@ -891,7 +891,7 @@ class fulltext_native extends search_backend if ($type == 'posts') { $sql = "SELECT $select - FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($topic_id || $firstpost_only) ? ', ' . TOPICS_TABLE . ' t' : '') . " + FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t' : '') . " WHERE $sql_author $sql_topic_id $sql_firstpost |