diff options
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index cc321003ca..0138861b34 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -675,12 +675,12 @@ function validate_optional_fields(&$icq, &$aim, &$msnm, &$yim, &$website, &$loca // contains at least one dot. if ($website != '') { - if (!preg_match('#^http:\/\/#i', $website)) + if (!preg_match('#^http[s]?:\/\/#i', $website)) { $website = 'http://' . $website; } - if (!preg_match('#^http\\:\\/\\/[a-z0-9\-]+\.([a-z0-9\-]+\.)?[a-z]+#i', $website)) + if (!preg_match('#^http[s]?\\:\\/\\/[a-z0-9\-]+\.([a-z0-9\-]+\.)?[a-z]+#i', $website)) { $website = ''; } @@ -801,7 +801,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) // This is a hack just to show something useful. // $msg_text won't contain anything if $user isn't there yet. // I ran into this problem when installing without makeing config_cache.php writable - if ( !class_exists($user) ) + if (!isset($user)) { die("Unable to show notice, \$user class hasn't been instantiated yet.<br />Error triggered in: " . $errfile .":". $errline); } |