diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-03-22 16:34:26 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-03-22 16:34:26 +0000 |
| commit | 4cbf6bc703bdadf716197b68a89b3438247ff022 (patch) | |
| tree | 952f7fe84b9428d10e4d49d535c5108e06d4640a /phpBB/install/schemas | |
| parent | fac9c024ff370eb4c34f7a7ffa9048732e5c74c7 (diff) | |
| download | forums-4cbf6bc703bdadf716197b68a89b3438247ff022.tar forums-4cbf6bc703bdadf716197b68a89b3438247ff022.tar.gz forums-4cbf6bc703bdadf716197b68a89b3438247ff022.tar.bz2 forums-4cbf6bc703bdadf716197b68a89b3438247ff022.tar.xz forums-4cbf6bc703bdadf716197b68a89b3438247ff022.zip | |
Merge most changes from 3.0.x branch since the 25th december.
(Captcha changes for refreshing captcha image not included)
git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/schemas')
| -rw-r--r-- | phpBB/install/schemas/schema_data.php | 4 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_structure.php | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/install/schemas/schema_data.php b/phpBB/install/schemas/schema_data.php index ff14ef26fa..f4f5d3444d 100644 --- a/phpBB/install/schemas/schema_data.php +++ b/phpBB/install/schemas/schema_data.php @@ -109,6 +109,10 @@ $schema_data[] = array( array('captcha_gd_foreground_noise', '0'), array('captcha_gd_x_grid', '25'), array('captcha_gd_y_grid', '25'), + array('captcha_gd_wave', '0'), + array('captcha_gd_3d_noise', '1'), + array('captcha_gd_fonts', '1'), + array('confirm_refresh', '1'), array('check_attachment_content', '1'), array('check_dnsbl', '0'), array('chg_passforce', '0'), diff --git a/phpBB/install/schemas/schema_structure.php b/phpBB/install/schemas/schema_structure.php index f438ff2215..641fafc4ac 100644 --- a/phpBB/install/schemas/schema_structure.php +++ b/phpBB/install/schemas/schema_structure.php @@ -55,7 +55,7 @@ $schema_data['phpbb_acl_options'] = array( ), 'PRIMARY_KEY' => 'auth_option_id', 'KEYS' => array( - 'auth_option' => array('INDEX', 'auth_option'), + 'auth_option' => array('UNIQUE', 'auth_option'), ), ); |