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

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2024-05-03 22:16:41 +02:00
parent a05ce5fd59 2267ef1ac2
commit 241cd5f41a
3 changed files with 69 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,8 +201,8 @@ abstract class base implements reparser_interface
*/
protected function guess_magic_url(array $record)
{
// Look for <!-- m --> or for a URL tag that's not immediately followed by <s>
return (strpos($record['text'], '<!-- m -->') !== false || preg_match('(<URL [^>]++>(?!<s>))', $record['text']));
// Look for magic URL markers or for a URL tag that's not immediately followed by <s>
return preg_match('#<!-- ([lmwe]) -->.*?<!-- \1 -->#', $record['text']) || preg_match('(<URL [^>]++>(?!<s>))', $record['text']);
}
/**
@@ -234,7 +234,10 @@ abstract class base implements reparser_interface
*/
protected function reparse_record(array $record)
{
// Guess magic URL state based on actual record content before adding fields
$record['enable_magic_url'] = $this->guess_magic_url($record);
$record = $this->add_missing_fields($record);
$flags = ($record['enable_bbcode']) ? OPTION_FLAG_BBCODE : 0;
$flags |= ($record['enable_smilies']) ? OPTION_FLAG_SMILIES : 0;
$flags |= ($record['enable_magic_url']) ? OPTION_FLAG_LINKS : 0;