mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
- strip_bbcode should not treat smilies which look like BBCode and are placed in front of a closing tag as BBCode
- highlight in post subjects and topic titles - language entry SMILIE_ONE_ADDED should have been SMILIES_ONE_ADDED git-svn-id: file:///svn/phpbb/trunk@8045 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -2527,7 +2527,7 @@ function strip_bbcode(&$text, $uid = '')
|
||||
$uid = '[0-9a-z]{5,}';
|
||||
}
|
||||
|
||||
$text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=.*?)?(?::[a-z])?(\:?$uid)\]#", ' ', $text);
|
||||
$text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=(?:".*"|[^\]]*))?(?::[a-z])?(\:$uid)\]#", ' ', $text);
|
||||
|
||||
$match = get_preg_expression('bbcode_htm');
|
||||
$replace = array('\1', '\1', '\2', '\1', '', '');
|
||||
@@ -3689,6 +3689,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
|
||||
{
|
||||
return;
|
||||
}
|
||||
static $counter = 0;
|
||||
$counter++; //echo "<b>"; var_dump($counter); echo "</b>";
|
||||
|
||||
if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
|
||||
{
|
||||
|
Reference in New Issue
Block a user