aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_convert.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/functions_convert.php')
-rw-r--r--phpBB/includes/functions_convert.php18
1 files changed, 17 insertions, 1 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 414f6f2f20..4037fb4872 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 (strpos(strtolower($url), 'http://') !== 0)
+ {
+ return 'http://' . $url;
+ }
}
/**
@@ -2413,4 +2419,14 @@ function get_smiley_display()
return ($smiley_count < 50) ? 1 : 0;
}
+
+function fill_dateformat($user_dateformat)
+{
+ global $config;
+
+ return ((empty($user_dateformat)) ? $config['default_dateformat'] : $user_dateformat);
+}
+
+
+
?> \ No newline at end of file