diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-11 15:18:33 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-11 15:18:33 +0100 |
| commit | ae984025f0575554bb78fef9dcf66233748e97c8 (patch) | |
| tree | 633c4940c92626dfbd06efa70987f99e03bd0b28 /phpBB/search.php | |
| parent | e02d92ac62fbe1dc08994444c18a7447d72c56e6 (diff) | |
| parent | 3850b05fbb9a292957e41023fcea797191442692 (diff) | |
| download | forums-ae984025f0575554bb78fef9dcf66233748e97c8.tar forums-ae984025f0575554bb78fef9dcf66233748e97c8.tar.gz forums-ae984025f0575554bb78fef9dcf66233748e97c8.tar.bz2 forums-ae984025f0575554bb78fef9dcf66233748e97c8.tar.xz forums-ae984025f0575554bb78fef9dcf66233748e97c8.zip | |
Merge branch 'develop' into feature/event-dispatcher
* develop: (95 commits)
[ticket/9084] Explain the logic.
[ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
[ticket/9813] Only get posts table row count if we detected a fulltext index.
[feature/append_var] Adding test case
[ticket/7432] Delete redundant reference to "appropriate menu item".
[ticket/10618] Change phpBB 3 to phpBB 3.1.
[ticket/10685] Refactor template test defaults for php 5.4 compatibility.
[feature/append_var] Adding append_var template class function
[ticket/9813] Also use estimated row count of posts table for fulltext mysql.
[ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
[ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
[ticket/10653] Add ability to count table rows to database abstraction layer.
[ticket/9813] Use table status row count only if greater than 100000 or exact.
[ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
[ticket/8652] Comment for also updating forum watch table in user_notification.
[ticket/8652] Sending 2 emails on 2 replies
[ticket/10680] Add /phpBB/ext/* to .gitignore
[ticket/10672] Fix total post count language string in statistics and feed
[ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
[ticket/10453] Fixing spacing
...
Conflicts:
tests/bootstrap.php
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 49 |
1 files changed, 37 insertions, 12 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 4f30cdc1dd..2b463aec9c 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -465,33 +465,60 @@ if ($keywords || $author || $author_id || $search_id || $submit) $per_page = ($show_results == 'posts') ? $config['posts_per_page'] : $config['topics_per_page']; $total_match_count = 0; + // Set limit for the $total_match_count to reduce server load + $total_matches_limit = 1000; + $found_more_search_matches = false; + if ($search_id) { if ($sql) { - // only return up to 1000 ids (the last one will be removed later) - $result = $db->sql_query_limit($sql, 1001 - $start, $start); + // Only return up to $total_matches_limit+1 ids (the last one will be removed later) + $result = $db->sql_query_limit($sql, $total_matches_limit + 1); while ($row = $db->sql_fetchrow($result)) { $id_ary[] = (int) $row[$field]; } $db->sql_freeresult($result); - - $total_match_count = sizeof($id_ary) + $start; - $id_ary = array_slice($id_ary, 0, $per_page); } else if ($search_id == 'unreadposts') { - $id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, 1001 - $start, $start)); - - $total_match_count = sizeof($id_ary) + $start; - $id_ary = array_slice($id_ary, 0, $per_page); + // Only return up to $total_matches_limit+1 ids (the last one will be removed later) + $id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, $total_matches_limit + 1)); } else { $search_id = ''; } + + $total_match_count = sizeof($id_ary); + if ($total_match_count) + { + // Limit the number to $total_matches_limit for pre-made searches + if ($total_match_count > $total_matches_limit) + { + $found_more_search_matches = true; + $total_match_count = $total_matches_limit; + } + + // Make sure $start is set to the last page if it exceeds the amount + if ($start < 0) + { + $start = 0; + } + else if ($start >= $total_match_count) + { + $start = floor(($total_match_count - 1) / $per_page) * $per_page; + } + + $id_ary = array_slice($id_ary, $start, $per_page); + } + else + { + // Set $start to 0 if no matches were found + $start = 0; + } } // make sure that some arrays are always in the same order @@ -539,10 +566,8 @@ if ($keywords || $author || $author_id || $search_id || $submit) $icons = $cache->obtain_icons(); // Output header - if ($search_id && ($total_match_count > 1000)) + if ($found_more_search_matches) { - // limit the number to 1000 for pre-made searches - $total_match_count--; $l_search_matches = $user->lang('FOUND_MORE_SEARCH_MATCHES', (int) $total_match_count); } else |