mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 00:40:56 +02:00
Code Issues Releases Wiki Activity

[ticket/11051] use get_common_words in search backend

Browse Source 
Use get_common_words() instead of accessing the common_words property
directly as it is now protected.

PHPBB3-11051
This commit is contained in:
Dhruv
2012-08-16 23:16:26 +05:30
parent 7402328b81
commit 9b9dc2fab7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/search.php
View File

@ -293,7 +293,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
$correct_query = $search->split_keywords($keywords, $search_terms); $correct_query = $search->split_keywords($keywords, $search_terms);
if (!$correct_query || (!$search->get_search_query() && !sizeof($author_id_ary) && !$search_id)) if (!$correct_query || (!$search->get_search_query() && !sizeof($author_id_ary) && !$search_id))
{ {
$ignored = (sizeof($search->common_words)) ? sprintf($user->lang['IGNORED_TERMS_EXPLAIN'], implode(' ', $search->common_words)) . '<br />' : ''; $ignored = (sizeof($search->get_common_words())) ? sprintf($user->lang['IGNORED_TERMS_EXPLAIN'], implode(' ', $search->get_common_words())) . '<br />' : '';
trigger_error($ignored . $user->lang('NO_KEYWORDS', $user->lang('CHARACTERS', (int) $search->word_length['min']), $user->lang('CHARACTERS', (int) $search->word_length['max']))); trigger_error($ignored . $user->lang('NO_KEYWORDS', $user->lang('CHARACTERS', (int) $search->word_length['min']), $user->lang('CHARACTERS', (int) $search->word_length['max'])));
} }
} }
@ -610,7 +610,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
'SEARCH_MATCHES' => $l_search_matches, 'SEARCH_MATCHES' => $l_search_matches,
'SEARCH_WORDS' => $keywords, 'SEARCH_WORDS' => $keywords,
'SEARCHED_QUERY' => $search->get_search_query(), 'SEARCHED_QUERY' => $search->get_search_query(),
'IGNORED_WORDS' => (sizeof($search->common_words)) ? implode(' ', $search->common_words) : '', 'IGNORED_WORDS' => (sizeof($search->get_common_words())) ? implode(' ', $search->get_common_words()) : '',
'PAGE_NUMBER' => phpbb_on_page($template, $user, $u_search, $total_match_count, $per_page, $start), 'PAGE_NUMBER' => phpbb_on_page($template, $user, $u_search, $total_match_count, $per_page, $start),
'PHRASE_SEARCH_DISABLED' => $phrase_search_disabled, 'PHRASE_SEARCH_DISABLED' => $phrase_search_disabled,