diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-08-01 17:39:52 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-01 17:39:52 +0200 |
| commit | acc7cb5e23744ebf591e223da4a3f079a8b3f9fb (patch) | |
| tree | 785c9c7ac45cc5a3d824865ad280155ea7c3fc48 /phpBB | |
| parent | 0a73d64b9772971b7e43e989c659184ee20c5bc6 (diff) | |
| parent | fc89fa2fec9a9b932ecf422f255f408f6bb8224d (diff) | |
| download | forums-acc7cb5e23744ebf591e223da4a3f079a8b3f9fb.tar forums-acc7cb5e23744ebf591e223da4a3f079a8b3f9fb.tar.gz forums-acc7cb5e23744ebf591e223da4a3f079a8b3f9fb.tar.bz2 forums-acc7cb5e23744ebf591e223da4a3f079a8b3f9fb.tar.xz forums-acc7cb5e23744ebf591e223da4a3f079a8b3f9fb.zip | |
Merge branch 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3 into prep-release-3.0.12
* 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3:
[ticket/11753] Remove ?> from MySQL Upgrader.
[ticket/11753] Update MySQL upgrader schema data.
[ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
[ticket/11752] HTTP -> HTTPs in email/installed.txt
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/develop/mysql_upgrader.php | 24 | ||||
| -rw-r--r-- | phpBB/language/en/email/installed.txt | 2 |
2 files changed, 22 insertions, 4 deletions
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 05d279a099..dcf2f2c88b 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -149,7 +149,8 @@ foreach ($schema_data as $table_name => $table_data) list($orig_column_type, $column_length) = explode(':', $column_data[0]); $column_type = sprintf($dbms_type_map['mysql_41'][$orig_column_type . ':'], $column_length); - if (isset($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][0])) + if (isset($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit']) && + isset($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][0])) { switch ($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][0]) { @@ -694,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), @@ -897,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), @@ -1396,5 +1416,3 @@ function get_schema_struct() return $schema_data; } - -?>
\ No newline at end of file diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt index 2aa03a7f33..60e52e37c4 100644 --- a/phpBB/language/en/email/installed.txt +++ b/phpBB/language/en/email/installed.txt @@ -12,7 +12,7 @@ Username: {USERNAME} Board URL: {U_BOARD} ---------------------------- -Useful information regarding the phpBB software can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/ +Useful information regarding the phpBB software can be found in the docs folder of your installation and on phpBB.com's support page - https://www.phpbb.com/support/ In order to keep your board safe and secure, we highly recommended keeping current with software releases. For your convenience, a mailing list is available at the page referenced above. |