mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 03:04:09 +02:00
[ticket/16426] Search results return characters as input box
PHPBB3-16426
This commit is contained in:
@@ -47,7 +47,7 @@ $sort_days = $request->variable('st', 0);
|
||||
$sort_key = $request->variable('sk', 't');
|
||||
$sort_dir = $request->variable('sd', 'd');
|
||||
|
||||
$return_chars = $request->variable('ch', ($topic_id) ? -1 : 300);
|
||||
$return_chars = $request->variable('ch', $topic_id ? 0 : (int) $config['default_search_return_chars']);
|
||||
$search_forum = $request->variable('fid', array(0));
|
||||
|
||||
// We put login boxes for the case if search_id is newposts, egosearch or unreadposts
|
||||
@@ -692,7 +692,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
|
||||
$u_search .= ($u_search_forum) ? '&fid%5B%5D=' . $u_search_forum : '';
|
||||
$u_search .= (!$search_child) ? '&sc=0' : '';
|
||||
$u_search .= ($search_fields != 'all') ? '&sf=' . $search_fields : '';
|
||||
$u_search .= ($return_chars != 300) ? '&ch=' . $return_chars : '';
|
||||
$u_search .= $return_chars !== (int) $config['default_search_return_chars'] ? '&ch=' . $return_chars : '';
|
||||
|
||||
/**
|
||||
* Event to add or modify search URL parameters
|
||||
@@ -975,7 +975,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
|
||||
strip_bbcode($text_only_message, $row['bbcode_uid']);
|
||||
}
|
||||
|
||||
if ($return_chars == -1 || utf8_strlen($text_only_message) < ($return_chars + 3))
|
||||
if ($return_chars === 0 || utf8_strlen($text_only_message) < ($return_chars + 3))
|
||||
{
|
||||
$row['display_text_only'] = false;
|
||||
|
||||
@@ -1475,18 +1475,6 @@ if (!$s_forums)
|
||||
trigger_error('NO_SEARCH');
|
||||
}
|
||||
|
||||
// Number of chars returned
|
||||
$s_characters = '<option value="-1">' . $user->lang['ALL_AVAILABLE'] . '</option>';
|
||||
$s_characters .= '<option value="0">0</option>';
|
||||
$s_characters .= '<option value="25">25</option>';
|
||||
$s_characters .= '<option value="50">50</option>';
|
||||
|
||||
for ($i = 100; $i <= 1000; $i += 100)
|
||||
{
|
||||
$selected = ($i == 300) ? ' selected="selected"' : '';
|
||||
$s_characters .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
|
||||
}
|
||||
|
||||
$s_hidden_fields = array('t' => $topic_id);
|
||||
|
||||
if ($_SID)
|
||||
@@ -1504,9 +1492,9 @@ if (!empty($_EXTRA_URL))
|
||||
}
|
||||
|
||||
$template->assign_vars(array(
|
||||
'DEFAULT_RETURN_CHARS' => (int) $config['default_search_return_chars'],
|
||||
'S_SEARCH_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx", false, true, 0), // We force no ?sid= appending by using 0
|
||||
'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields),
|
||||
'S_CHARACTER_OPTIONS' => $s_characters,
|
||||
'S_FORUM_OPTIONS' => $s_forums,
|
||||
'S_SELECT_SORT_DIR' => $s_sort_dir,
|
||||
'S_SELECT_SORT_KEY' => $s_sort_key,
|
||||
|
Reference in New Issue
Block a user