aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenky <jakubsenko@gmail.com>2013-05-21 11:55:45 +0200
committerSenky <jakubsenko@gmail.com>2013-05-21 11:55:45 +0200
commit930f4c70ed7acca6a85e95e00c6562c25e0d67a2 (patch)
tree160737f083a95be90dc8f486a10a7d26288b2b5e
parent3e64c1b5d77dd4333c94c3688e0ba47ca7dcf328 (diff)
downloadforums-930f4c70ed7acca6a85e95e00c6562c25e0d67a2.tar
forums-930f4c70ed7acca6a85e95e00c6562c25e0d67a2.tar.gz
forums-930f4c70ed7acca6a85e95e00c6562c25e0d67a2.tar.bz2
forums-930f4c70ed7acca6a85e95e00c6562c25e0d67a2.tar.xz
forums-930f4c70ed7acca6a85e95e00c6562c25e0d67a2.zip
[ticket/11010] resolving latest comments
PHPBB3-11010
-rw-r--r--phpBB/includes/acp/acp_board.php3
-rw-r--r--phpBB/includes/functions_acp.php1
-rw-r--r--phpBB/install/index.php1
3 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 6ac79c09a0..34040367fb 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -399,7 +399,8 @@ class acp_board
'legend1' => 'ACP_SECURITY_SETTINGS',
'allow_autologin' => array('lang' => 'ALLOW_AUTOLOGIN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'allow_password_reset' => array('lang' => 'ALLOW_PASSWORD_RESET', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
- 'max_autologin_time' => array('lang' => 'AUTOLOGIN_LENGTH', 'validate' => 'int:0:99999', 'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']), 'ip_check' => array('lang' => 'IP_VALID', 'validate' => 'int', 'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
+ 'max_autologin_time' => array('lang' => 'AUTOLOGIN_LENGTH', 'validate' => 'int:0:99999', 'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
+ 'ip_check' => array('lang' => 'IP_VALID', 'validate' => 'int', 'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
'browser_check' => array('lang' => 'BROWSER_VALID', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'forwarded_for_check' => array('lang' => 'FORWARDED_FOR_VALID', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'referer_validation' => array('lang' => 'REFERER_VALID', 'validate' => 'int:0:3','type' => 'custom', 'method' => 'select_ref_check', 'explain' => true),
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index f384d242ce..ff0e2a1ac1 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -260,7 +260,6 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
case 'range':
case 'search':
case 'tel':
- case 'time':
case 'url':
case 'week':
$size = (int) $tpl_type[1];
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index e3e7f0e77f..4a3538e545 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -678,7 +678,6 @@ class module
case 'range':
case 'search':
case 'tel':
- case 'time':
case 'url':
case 'week':