aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-06-29 11:39:22 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-06-29 11:39:22 +0000
commit1c22e7a40728fde76b9b9e5afd168f8eb0313268 (patch)
tree2d0a9dc57351d507277f9af97019a1932c58bd8e
parent648de4354a02c0b48d1e823c6d0196720586cb73 (diff)
downloadforums-1c22e7a40728fde76b9b9e5afd168f8eb0313268.tar
forums-1c22e7a40728fde76b9b9e5afd168f8eb0313268.tar.gz
forums-1c22e7a40728fde76b9b9e5afd168f8eb0313268.tar.bz2
forums-1c22e7a40728fde76b9b9e5afd168f8eb0313268.tar.xz
forums-1c22e7a40728fde76b9b9e5afd168f8eb0313268.zip
Oh well, not much we can do for boards already converted.
#12819 git-svn-id: file:///svn/phpbb/trunk@7807 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_convert.php8
2 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index b01e970ef5..b7201dface 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -196,6 +196,7 @@ p a {
<li>[Fix] Allow adding of help language files within subdirectories (Bug #12783)</li>
<li>[Fix] Correctly apply smileys on posting having # within their emotion code</li>
<li>[Fix] Correctly convert smileys having double quotes within their emotion code (Bug #12731)</li>
+ <li>[Fix] The converter now adds the protocol to user website profile fields missing it (Bug #12819)</li>
</ul>
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 324844aa7f..0aa3c205f5 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -224,7 +224,13 @@ function make_uid($timestamp)
*/
function validate_website($url)
{
- return ($url == 'http://') ? '' : $url;
+ if ($url === 'http://'){
+ return '';
+ }
+ else if (strstr('http://', $url) !== 0)
+ {
+ return 'http://' . $url;
+ }
}
/**