makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 13:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16426] Correct migration dependent and common 'selected' approach

Browse source 
PHPBB3-16426
This commit is contained in:
mrgoldy 2020-05-04 12:01:26 +02:00
parent d9e07b3b29
commit b8bab30684
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/db/migration/data/v330/default_search_return_chars.php
View file

@ -23,7 +23,7 @@ class default_search_return_chars extends \phpbb\db\migration\migration
public static function depends_on() public static function depends_on()
{ {
return [ return [
'\phpbb\db\migration\data\v330\dev', '\phpbb\db\migration\data\v330\v330',
]; ];
} }

6
phpBB/search.php
View file

@ -1483,7 +1483,7 @@ if (!$s_forums)
* *
* @deprecated 3.3.1-RC1 Templates should use an numeric input, in favor of a select. * @deprecated 3.3.1-RC1 Templates should use an numeric input, in favor of a select.
*/ */
$s_characters = '<option value="0">' . $user->lang('ALL_AVAILABLE') . '</option>'; $s_characters = '<option value="0">' . $language->lang('ALL_AVAILABLE') . '</option>';
$i_characters = array_merge([25, 50], range(100, 1000, 100)); $i_characters = array_merge([25, 50], range(100, 1000, 100));
if ($config['default_search_return_chars'] && !in_array((int) $config['default_search_return_chars'], $i_characters)) if ($config['default_search_return_chars'] && !in_array((int) $config['default_search_return_chars'], $i_characters))
@ -1494,8 +1494,8 @@ if ($config['default_search_return_chars'] && !in_array((int) $config['default_s
foreach ($i_characters as $i) foreach ($i_characters as $i)
{ {
$selected = $i === (int) $config['default_search_return_chars'] ? '" selected="selected' : ''; $selected = $i === (int) $config['default_search_return_chars'] ? ' selected="selected"' : '';
$s_characters .= sprintf('<option value="%1$s%2$s">%1$s</option>', $i, $selected); $s_characters .= sprintf('<option value="%1$s"%2$s>%1$s</option>', $i, $selected);
} }
$s_hidden_fields = array('t' => $topic_id); $s_hidden_fields = array('t' => $topic_id);