From b8bab306846ca502aa76be4d23c2a8f09c2a9bde Mon Sep 17 00:00:00 2001
From: mrgoldy <gijsmartens1@gmail.com>
Date: Mon, 4 May 2020 12:01:26 +0200
Subject: [PATCH] [ticket/16426] Correct migration dependent and common
 'selected' approach

PHPBB3-16426
---
 .../db/migration/data/v330/default_search_return_chars.php  | 2 +-
 phpBB/search.php                                            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/phpbb/db/migration/data/v330/default_search_return_chars.php b/phpBB/phpbb/db/migration/data/v330/default_search_return_chars.php
index 1cae2da8d0..a0b80c4de0 100644
--- a/phpBB/phpbb/db/migration/data/v330/default_search_return_chars.php
+++ b/phpBB/phpbb/db/migration/data/v330/default_search_return_chars.php
@@ -23,7 +23,7 @@ class default_search_return_chars extends \phpbb\db\migration\migration
 	public static function depends_on()
 	{
 		return [
-			'\phpbb\db\migration\data\v330\dev',
+			'\phpbb\db\migration\data\v330\v330',
 		];
 	}
 
diff --git a/phpBB/search.php b/phpBB/search.php
index edf6360caa..678b4d9ff8 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -1483,7 +1483,7 @@ if (!$s_forums)
  *
  * @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));
 
 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)
 {
-	$selected = $i === (int) $config['default_search_return_chars'] ? '" selected="selected' : '';
-	$s_characters .= sprintf('<option value="%1$s%2$s">%1$s</option>', $i, $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_hidden_fields = array('t' => $topic_id);