2 files changed, 17 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index c6bbbf18f7..8a601467dd 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -99,10 +99,24 @@ class acp_search
 				continue;
 			}
 
+			// e.g. integer:4:12 (min 4, max 12)
+			$var_type = explode(':', $var_type);
+
 			$config_value = $cfg_array[$config_name];
-			settype($config_value, $var_type);
+			settype($config_value, $var_type[0]);
+
+			if (isset($var_type[1]))
+			{
+				$config_value = max($var_type[1], $config_value);
+			}
+
+			if (isset($var_type[2]))
+			{
+				$config_value = min($var_type[2], $config_value);
+			}
 
-			if ($submit)
+			// only change config if anything was actually changed
+			if ($submit && ($config[$config_name] != $config_value))
 			{
 				set_config($config_name, $config_value);
 				$updated = true;
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 34a832d6ef..cdeb1d6c0e 100755
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -1098,7 +1098,7 @@ class fulltext_native extends search_backend
 		// These are fields required in the config table
 		return array(
 			'tpl'		=> $tpl,
-			'config'	=> array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer', 'fulltext_native_max_chars' => 'integer')
+			'config'	=> array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer:0:252', 'fulltext_native_max_chars' => 'integer:0:252')
 		);
 	}
 }