From bc698d155133c3dfedf0f9fec1d1dbbf23e181db Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Thu, 26 Apr 2007 09:28:08 +0000 Subject: [PATCH] #10137 - users without avatar caused error message. git-svn-id: file:///svn/phpbb/trunk@7407 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/convertors/functions_phpbb20.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 675a64eecb..dd09a4454d 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1442,7 +1442,11 @@ function phpbb_import_avatar($user_avatar) function phpbb_get_avatar_height($user_avatar) { global $convert_row; - + + if (empty($convert_row['user_avatar_type'])) + { + return 0; + } return get_avatar_height($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']); } @@ -1454,6 +1458,11 @@ function phpbb_get_avatar_width($user_avatar) { global $convert_row; + if (empty($convert_row['user_avatar_type'])) + { + return 0; + } + return get_avatar_width($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']); }