2 files changed, 25 insertions, 2 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 52f0178b55..c9e9239068 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -866,8 +866,8 @@ if (!$get_info)
 
 				array('user_avatar',			'users.user_avatar',				'phpbb_import_avatar'),
 				array('user_avatar_type',		'users.user_avatar_type',			'phpbb_avatar_type'),
-				array('user_avatar_width',		'users.user_avatar',				'get_avatar_width'),
-				array('user_avatar_height',		'users.user_avatar',				'get_avatar_height'),
+				array('user_avatar_width',		'users.user_avatar',				'phpbb_get_avatar_width'),
+				array('user_avatar_height',		'users.user_avatar',				'phpbb_get_avatar_height'),
 
 				array('user_new_privmsg',		'users.user_new_privmsg',			''),
 				array('user_unread_privmsg',	0,									''), //'users.user_unread_privmsg'
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index 5c3deab0fc..675a64eecb 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -1435,6 +1435,29 @@ function phpbb_import_avatar($user_avatar)
 	return '';
 }
 
+
+/**
+* Find out about the avatar's dimensions
+*/
+function phpbb_get_avatar_height($user_avatar)
+{
+	global $convert_row;
+
+	return get_avatar_height($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']);
+}
+
+
+/**
+* Find out about the avatar's dimensions
+*/
+function phpbb_get_avatar_width($user_avatar)
+{
+	global $convert_row;
+
+	return get_avatar_width($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']);
+}
+
+
 /**
 * Calculate the correct to_address field for private messages
 */