diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-30 14:14:32 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-30 14:14:32 +0200 |
| commit | 63a017ec90602a01910438956647990886a2be49 (patch) | |
| tree | 7d708cda1dd7a81d2a732a3cee4028bbeceead5b /phpBB | |
| parent | d20979c43ced68eba4bdb228a4c9fa408e5ff21f (diff) | |
| parent | fc89fa2fec9a9b932ecf422f255f408f6bb8224d (diff) | |
| download | forums-63a017ec90602a01910438956647990886a2be49.tar forums-63a017ec90602a01910438956647990886a2be49.tar.gz forums-63a017ec90602a01910438956647990886a2be49.tar.bz2 forums-63a017ec90602a01910438956647990886a2be49.tar.xz forums-63a017ec90602a01910438956647990886a2be49.zip | |
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
[ticket/11753] Remove ?> from MySQL Upgrader.
[ticket/11753] Update MySQL upgrader schema data.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/develop/mysql_upgrader.php | 21 |
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 |