Merge branch '3.1.x'

This commit is contained in:
Joas Schilling 2015-06-07 17:11:10 +02:00
commit 6817418b06

View file

@ -32,7 +32,7 @@ class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case
array('config_key_name' => '2'), array('config_key_name' => '2'),
'config_key_name', 'config_key_name',
array(), array(),
'<input id="key_name" type="password" size="20" maxlength="128" name="config[config_key_name]" value="2" autocomplete="off" />', '<input id="key_name" type="password" size="20" maxlength="128" name="config[config_key_name]" value="********" autocomplete="off" />',
), ),
array( array(
array('text', 0, 255), array('text', 0, 255),