diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-06 23:19:02 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-06 23:19:02 +0200 |
| commit | 5eeb870442e01b3949489107ca80c584b36ff4ac (patch) | |
| tree | cf17721db504a0ae9674faedf24dce2ebba98ad8 /phpBB/install/database_update.php | |
| parent | 7e4460dbc99ce25dbeaa57eaedddea6112cfb9bf (diff) | |
| parent | ca2d6a01f1cc93a0ffa5e9545bfeb257fcf643e1 (diff) | |
| download | forums-5eeb870442e01b3949489107ca80c584b36ff4ac.tar forums-5eeb870442e01b3949489107ca80c584b36ff4ac.tar.gz forums-5eeb870442e01b3949489107ca80c584b36ff4ac.tar.bz2 forums-5eeb870442e01b3949489107ca80c584b36ff4ac.tar.xz forums-5eeb870442e01b3949489107ca80c584b36ff4ac.zip | |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[ticket/10247] Remove attempt_id as primary key from database_update.php
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index fe2946501f..2cceca2d3e 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -960,7 +960,7 @@ function database_update_info() 'username' => array('VCHAR_UNI:255', 0), 'username_clean' => array('VCHAR_CI', 0), ), - 'PRIMARY_KEY' => 'attempt_id', + //'PRIMARY_KEY' => 'attempt_id', 'KEYS' => array( 'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')), 'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')), |