mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00
Code Issues Releases Wiki Activity

Merge pull request #5860 from JoshyPHP/ticket/16361

Browse Source 
[ticket/16361] Change the link shortener
This commit is contained in:
Marc Alexander
2020-04-16 20:49:15 +02:00
parent f9d4e11a27 a5f1ff43b5
commit 6b47cbb4c5
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_board.php
View File

@@ -549,8 +549,8 @@ class acp_board
}
}
// Invalidate the text_formatter cache when posting options are changed
if ($mode == 'post' && $submit)
// Invalidate the text_formatter cache when posting or server options are changed
if (preg_match('(^(?:post|server)$)', $mode) && $submit)
{
$phpbb_container->get('text_formatter.cache')->invalidate();
}

8
phpBB/phpbb/textformatter/s9e/factory.php
View File

@@ -470,11 +470,17 @@ class factory implements \phpbb\textformatter\cache_interface
$tag->attributes->add('text');
$tag->template = '<xsl:value-of select="@text"/>';
$board_url = generate_board_url() . '/';
$tag->filterChain
->add(array($this->link_helper, 'truncate_local_url'))
->resetParameters()
->addParameterByName('tag')
->addParameterByValue(generate_board_url() . '/');
->addParameterByValue($board_url);
$tag->filterChain
->add(array($this->link_helper, 'truncate_local_url'))
->resetParameters()
->addParameterByName('tag')
->addParameterByValue(preg_replace('(^\\w+:)', '', $board_url));
$tag->filterChain
->add(array($this->link_helper, 'truncate_text'))
->resetParameters()