6 files changed, 16 insertions, 15 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index b01b19fa69..14dd4c370b 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -8,17 +8,14 @@
 *
 */
 
-/*
-* @todo Make all spellings consistant with those in the main code (eg smilie, etc) as there are several used
+/**
+* Default avatar width/height
+* @ignore
 */
-
-// Default avatar width/height
 define('DEFAULT_AVATAR_X', 80);
 define('DEFAULT_AVATAR_Y', 80);
 
-/**
-* Global functions - all functions can be used by convertors
-*/
+// Global functions - all functions can be used by convertors
 
 /**
 * Determine whether we are approaching the maximum execution time
@@ -1055,10 +1052,9 @@ function add_user_group($group_id, $user_id, $group_leader=false)
 
 /**
 * Add users to the pre-defined "special" groups
+*
 * @param string $group The name of the special group to add to
 * @param string $select_query An SQL query to retrieve the user(s) to add to the group
-*
-* @todo Is this perhaps misnamed? It doesn't appear to directly have anything to do with auth
 */
 function user_group_auth($group, $select_query)
 {
diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php
index 00e5deab37..f9558c12b4 100644
--- a/phpBB/includes/utf/utf_tools.php
+++ b/phpBB/includes/utf/utf_tools.php
@@ -6,9 +6,6 @@
 * @copyright (c) 2006 phpBB Group 
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License 
 *
-* @todo make sure the replacements are called correctly
-* already done: strtolower, strtoupper, ucfirst, str_split, strrpos, strlen (hopefully!), strpos, substr, htmlspecialchars
-* remaining:	strspn, chr, ord
 */
 
 /**
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');