Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11753] Remove ?> from MySQL Upgrader.
  [ticket/11753] Update MySQL upgrader schema data.
This commit is contained in:
Joas Schilling 2013-07-30 14:15:09 +02:00
commit 21ee4c1854

View file

@ -699,6 +699,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( $schema_data['phpbb_moderator_cache'] = array(
'COLUMNS' => array( 'COLUMNS' => array(
'forum_id' => array('UINT', 0), 'forum_id' => array('UINT', 0),
@ -902,6 +920,7 @@ function get_schema_struct()
'field_default_value' => array('VCHAR_UNI', ''), 'field_default_value' => array('VCHAR_UNI', ''),
'field_validation' => array('VCHAR_UNI:20', ''), 'field_validation' => array('VCHAR_UNI:20', ''),
'field_required' => array('BOOL', 0), 'field_required' => array('BOOL', 0),
'field_show_novalue' => array('BOOL', 0),
'field_show_on_reg' => array('BOOL', 0), 'field_show_on_reg' => array('BOOL', 0),
'field_show_on_vt' => array('BOOL', 0), 'field_show_on_vt' => array('BOOL', 0),
'field_show_profile' => array('BOOL', 0), 'field_show_profile' => array('BOOL', 0),