diff options
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 3 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 1 | ||||
| -rw-r--r-- | phpBB/install/install_convert.php | 8 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 219ef788bd..14fde80478 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -143,7 +143,7 @@ if (!$get_info) { // Test to see if the birthday MOD is installed on the source forum // Niels' birthday mod - if (get_config_value('birthday_required') !== false) + if (get_config_value('birthday_required') !== false || get_config_value('bday_required') !== false) { define('MOD_BIRTHDAY', true); } @@ -151,7 +151,6 @@ if (!$get_info) // TerraFrost's validated birthday mod if (get_config_value('bday_required') !== false) { - define('MOD_BIRTHDAY', true); define('MOD_BIRTHDAY_TERRA', true); } diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 9870b47706..c2e672c863 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1289,6 +1289,7 @@ function sql_column_change($dbms, $table_name, $column_name, $column_data) /** * Add search robots to the database +* @ignore */ function add_bots() { diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 6bba61e434..256dd13b67 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -30,6 +30,10 @@ if (!empty($setmodules)) ); } +/** +* Class holding all convertor-specific details. +* @package install +*/ class convert { var $options = array(); @@ -63,6 +67,10 @@ class convert } } +/** +* Convert class for conversions +* @package install +*/ class install_convert extends module { /** diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 7c20f39679..ce151c020b 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -203,7 +203,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.B5-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.B5'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); |
