diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-11-25 23:46:23 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-11-25 23:46:23 +0000 |
| commit | 734c286f9fdfee1ce65f2e92730b9b0c50e27d62 (patch) | |
| tree | 3729b3bc729df5c46756f6f816c6d77e26bd04b5 /phpBB/includes/functions.php | |
| parent | efad1f2491413b1609577f59a94987492fd6fe76 (diff) | |
| download | forums-734c286f9fdfee1ce65f2e92730b9b0c50e27d62.tar forums-734c286f9fdfee1ce65f2e92730b9b0c50e27d62.tar.gz forums-734c286f9fdfee1ce65f2e92730b9b0c50e27d62.tar.bz2 forums-734c286f9fdfee1ce65f2e92730b9b0c50e27d62.tar.xz forums-734c286f9fdfee1ce65f2e92730b9b0c50e27d62.zip | |
Some changes to forum admin to better reflect subforum 'post/non-post' changes ... no guarantees I've not broken something ... note the schema changes
git-svn-id: file:///svn/phpbb/trunk@3094 89ea8834-ac86-4346-8a33-228a782c2dd0
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); } |