mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 05:50:42 +02:00
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
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user