mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-01 14:30:32 +02:00
More bbcode fixes
git-svn-id: file:///svn/phpbb/trunk@3879 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -312,18 +312,18 @@ class bbcode
|
||||
switch ($type)
|
||||
{
|
||||
case 'php':
|
||||
$remove_tags = FALSE;
|
||||
if (!preg_match('/<\?(php)? .*? \?>/', $code))
|
||||
{
|
||||
$remove_tags = TRUE;
|
||||
$code = "<?php $code ?>";
|
||||
}
|
||||
|
||||
$str_from = array('<', '>', '"', ':', '[', ']', '(', ')', '{', '}', '.', '@');
|
||||
$str_to = array('<', '>', '"', ':', '[', ']', '(', ')', '{', '}', '.', '@');
|
||||
|
||||
$code = str_replace($str_to, $str_from, $code);
|
||||
|
||||
$remove_tags = FALSE;
|
||||
if (!preg_match('/\<\?.*?\?\>/is', $code))
|
||||
{
|
||||
$remove_tags = TRUE;
|
||||
$code = "<?php $code ?>";
|
||||
}
|
||||
|
||||
ob_start();
|
||||
highlight_string($code);
|
||||
$code = ob_get_contents();
|
||||
@@ -331,10 +331,12 @@ class bbcode
|
||||
|
||||
if ($remove_tags)
|
||||
{
|
||||
$code = preg_replace('/(.*?)<\?php (.*)\?>(.*?)/', '\1\2\3', $code);
|
||||
$code = preg_replace('!^<code>[\n\r\s\t]*<font color="#[a-z0-9]+">[\n\r\s\t]*(<font color="#[a-z0-9]+">)<\?php (.*)\?></font>[\n\r\s\t]*(</font>)[\n\r\s\t]*</code>[\n\r\s\t]*!is', '\1\2\3', $code);
|
||||
}
|
||||
else
|
||||
{
|
||||
$code = preg_replace('!^<code>[\n\r\s\t]*<font color="#[a-z0-9]+">[\n\r\s\t]*(.*)</font>[\n\r\s\t]*</code>[\n\r\s\t]*!is', '\1', $code);
|
||||
}
|
||||
|
||||
$code = preg_replace('!^<code>[\n\r\s\t]*<font color="#[a-z0-9]+">[\n\r\s\t]*(.*)</font>[\n\r\s\t]*</code>[\n\r\s\t]*!is', '\\1', $code);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
Reference in New Issue
Block a user