aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-07-30 14:13:31 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-07-30 14:13:31 +0200
commitfc89fa2fec9a9b932ecf422f255f408f6bb8224d (patch)
tree694e1b52af796ecc3a5b647b7679a4eff9b52a64 /phpBB/develop/mysql_upgrader.php
parentMerge remote-tracking branch 'bantu/ticket/11524' into prep-release-3.0.12 (diff)
parent[ticket/11753] Remove ?> from MySQL Upgrader. (diff)
downloadphpbb-fc89fa2fec9a9b932ecf422f255f408f6bb8224d.tar.gz
phpbb-fc89fa2fec9a9b932ecf422f255f408f6bb8224d.tar.bz2
phpbb-fc89fa2fec9a9b932ecf422f255f408f6bb8224d.zip
Merge remote-tracking branch 'bantu/ticket/11753' into prep-release-3.0.12
* bantu/ticket/11753: [ticket/11753] Remove ?> from MySQL Upgrader. [ticket/11753] Update MySQL upgrader schema data.
Diffstat (limited to 'phpBB/develop/mysql_upgrader.php')
-rw-r--r--phpBB/develop/mysql_upgrader.php21
1 files changed, 19 insertions, 2 deletions
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 17ce12e2bf..dcf2f2c88b 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -695,6 +695,24 @@ function get_schema_struct()
),
);
+ $schema_data['phpbb_login_attempts'] = array(
+ 'COLUMNS' => array(
+ 'attempt_ip' => array('VCHAR:40', ''),
+ 'attempt_browser' => array('VCHAR:150', ''),
+ 'attempt_forwarded_for' => array('VCHAR:255', ''),
+ 'attempt_time' => array('TIMESTAMP', 0),
+ 'user_id' => array('UINT', 0),
+ 'username' => array('VCHAR_UNI:255', 0),
+ 'username_clean' => array('VCHAR_CI', 0),
+ ),
+ 'KEYS' => array(
+ 'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
+ 'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+ 'att_time' => array('INDEX', array('attempt_time')),
+ 'user_id' => array('INDEX', 'user_id'),
+ ),
+ );
+
$schema_data['phpbb_moderator_cache'] = array(
'COLUMNS' => array(
'forum_id' => array('UINT', 0),
@@ -898,6 +916,7 @@ function get_schema_struct()
'field_default_value' => array('VCHAR_UNI', ''),
'field_validation' => array('VCHAR_UNI:20', ''),
'field_required' => array('BOOL', 0),
+ 'field_show_novalue' => array('BOOL', 0),
'field_show_on_reg' => array('BOOL', 0),
'field_show_on_vt' => array('BOOL', 0),
'field_show_profile' => array('BOOL', 0),
@@ -1397,5 +1416,3 @@ function get_schema_struct()
return $schema_data;
}
-
-?> \ No newline at end of file