diff options
| -rw-r--r-- | phpBB/install/install.php | 8 | ||||
| -rw-r--r-- | phpBB/install/schemas/mysql_basic.sql | 1 | ||||
| -rw-r--r-- | phpBB/install/schemas/mysql_schema.sql | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/install/install.php b/phpBB/install/install.php index ef975423e2..f26b961afa 100644 --- a/phpBB/install/install.php +++ b/phpBB/install/install.php @@ -555,6 +555,7 @@ else { if ( $dbms != 'msaccess' ) { + // // Ok we have the db info go ahead and read in the relevant schema // and work on building the table.. probably ought to provide some @@ -698,7 +699,7 @@ else @umask(0111); $no_open = FALSE; - if ( !($fp = @fopen('../config.'.$phpEx, 'w')) ) + if ( !($fp = fopen('../config.'.$phpEx, 'w')) ) { // // Unable to open the file writeable do something here as an attempt @@ -747,7 +748,7 @@ else ); } - $template->assign_vars(array( + /*$template->assign_vars(array( "L_INSTRUCTION_TEXT" => $lang['Unwriteable_config'], "L_SUBMIT" => $lang['Download_config'], @@ -756,7 +757,8 @@ else ); $template->pparse('body'); - + */ + exit; } diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql index b58789e8b5..327bb1c54f 100644 --- a/phpBB/install/schemas/mysql_basic.sql +++ b/phpBB/install/schemas/mysql_basic.sql @@ -74,6 +74,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height' INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_enable','1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_confirm', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_method','db'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_server', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_base_dn', ''); diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql index 9a922d0357..e4998b8bae 100644 --- a/phpBB/install/schemas/mysql_schema.sql +++ b/phpBB/install/schemas/mysql_schema.sql @@ -717,7 +717,7 @@ CREATE TABLE phpbb_users ( user_notify_pm tinyint(1) DEFAULT '1' NOT NULL, user_popup_pm tinyint(1) DEFAULT '0' NOT NULL, user_avatar char(100), - user_avatar_type tinyint(4) DEFAULT '0' NOT NULL, + user_avatar_type tinyint(4) DEFAULT '0', user_avatar_width tinyint(4) UNSIGNED, user_avatar_height tinyint(4) UNSIGNED, user_sig text, |