1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

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
This commit is contained in:
Meik Sievertsen
2009-03-22 16:34:26 +00:00
parent fac9c024ff
commit 4cbf6bc703
80 changed files with 2491 additions and 916 deletions

View File

@@ -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'),

View File

@@ -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'),
),
);