diff options
author | Andreas Fischer <bantu@phpbb.com> | 2011-07-06 23:18:51 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-06 23:18:51 +0200 |
commit | ca2d6a01f1cc93a0ffa5e9545bfeb257fcf643e1 (patch) | |
tree | 490296953935b529c18ac914fb6ee3aba8acab3f /phpBB | |
parent | c916d49ddd6d7ad6ad508dd8981bc85f98a0e744 (diff) | |
parent | 0c93e92eef248c306c743601f6fadb8dc4eb8aa3 (diff) | |
download | forums-ca2d6a01f1cc93a0ffa5e9545bfeb257fcf643e1.tar forums-ca2d6a01f1cc93a0ffa5e9545bfeb257fcf643e1.tar.gz forums-ca2d6a01f1cc93a0ffa5e9545bfeb257fcf643e1.tar.bz2 forums-ca2d6a01f1cc93a0ffa5e9545bfeb257fcf643e1.tar.xz forums-ca2d6a01f1cc93a0ffa5e9545bfeb257fcf643e1.zip |
Merge remote-tracking branch 'nickvergessen/ticket/10247' into prep-release-3.0.9
* nickvergessen/ticket/10247:
[ticket/10247] Remove attempt_id as primary key from database_update.php
Diffstat (limited to 'phpBB')
-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 a2cb4515da..47c278ed4e 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')), |