mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/13990] Reparse markup inside of forum rules/description

Browse Source 
PHPBB3-13990
This commit is contained in:
JoshyPHP
2015-07-06 19:17:40 +02:00
parent f81a2bc7c5
commit a44711e574
11 changed files with 160 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
phpBB/phpbb/textreparser/base.php
View File

@@ -47,11 +47,22 @@ abstract class base implements reparser_interface
{
if (!isset($record['enable_bbcode'], $record['enable_smilies'], $record['enable_magic_url']))
{
$record += array(
'enable_bbcode' => $this->guess_bbcodes($record),
'enable_smilies' => $this->guess_smilies($record),
'enable_magic_url' => $this->guess_magic_url($record),
);
if (isset($record['options']))
{
$record += array(
'enable_bbcode' => (bool) ($record['options'] & OPTION_FLAG_BBCODE),
'enable_smilies' => (bool) ($record['options'] & OPTION_FLAG_SMILIES),
'enable_magic_url' => (bool) ($record['options'] & OPTION_FLAG_LINKS),
);
}
else
{
$record += array(
'enable_bbcode' => $this->guess_bbcodes($record),
'enable_smilies' => $this->guess_smilies($record),
'enable_magic_url' => $this->guess_magic_url($record),
);
}
}
// Those BBCodes are disabled based on context and user permissions and that value is never
@@ -92,7 +103,7 @@ abstract class base implements reparser_interface
}
}
if (substr($record['text'], 0, 2) == '<r')
if (substr($record['text'], 0, 2) === '<r')
{
// Look for the closing tag inside of a e element, in an element of the same name, e.g.
// <e>[/url]</e></URL>
@@ -124,7 +135,7 @@ abstract class base implements reparser_interface
}
}
if (substr($record['text'], 0, 2) == '<r')
if (substr($record['text'], 0, 2) === '<r')
{
// Look for a closing tag inside of an e element
return (bool) preg_match('(<e>\\[/\\w+\\]</e>)', $match);