From 316f087d47e0741fa6864cdb3868f6ca8f5c03bd Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sat, 14 Jul 2007 11:32:28 +0000 Subject: [PATCH] #13379 git-svn-id: file:///svn/phpbb/trunk@7882 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions_convert.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6d130fefc0..cc83b0168f 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -225,6 +225,7 @@ p a {
  • [Fix] Although theoretically impossible in our code, changed the handling of non-existent language files (Bug #13329, #13331)
  • [Fix] Removed extra ampersand from ACP link (Bug #13315)
  • [Fix] used cleaned up version of given field identification for pre-filling a new custom profile field (Bug #13319)
    • +
  • [Fix] Correctly convert 2.0 website profile fields. (Bug #13379)
    • diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 4037fb4872..5cd74ccbd3 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -224,13 +224,15 @@ function make_uid($timestamp) */ function validate_website($url) { - if ($url === 'http://'){ + if ($url === 'http://') + { return ''; } else if (strpos(strtolower($url), 'http://') !== 0) { return 'http://' . $url; } + return $url; } /**