diff options
| author | JoshyPHP <s9e.dev@gmail.com> | 2015-12-28 04:19:21 +0100 |
|---|---|---|
| committer | JoshyPHP <s9e.dev@gmail.com> | 2015-12-28 04:19:21 +0100 |
| commit | bc5d976786d60d8d33cf77fccf81ce351b59fcdc (patch) | |
| tree | f3fd1d4d2a360ab7946f36c37b1186bec934fe88 /phpBB/phpbb/textformatter/s9e/link_helper.php | |
| parent | bcd5d8b5126e57e8c4c93a0d0c1be5e25f0185ff (diff) | |
| download | forums-bc5d976786d60d8d33cf77fccf81ce351b59fcdc.tar forums-bc5d976786d60d8d33cf77fccf81ce351b59fcdc.tar.gz forums-bc5d976786d60d8d33cf77fccf81ce351b59fcdc.tar.bz2 forums-bc5d976786d60d8d33cf77fccf81ce351b59fcdc.tar.xz forums-bc5d976786d60d8d33cf77fccf81ce351b59fcdc.zip | |
[ticket/14323] Added should_shorten()
Explicitly tests a tag's markup to determine whether a link should be shortened
PHPBB3-14323
Diffstat (limited to 'phpBB/phpbb/textformatter/s9e/link_helper.php')
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/link_helper.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/link_helper.php b/phpBB/phpbb/textformatter/s9e/link_helper.php index 76948159ba..0f44603dec 100644 --- a/phpBB/phpbb/textformatter/s9e/link_helper.php +++ b/phpBB/phpbb/textformatter/s9e/link_helper.php @@ -47,7 +47,7 @@ class link_helper // Only create a LINK_TEXT tag if the start tag is paired with an end // tag, which is the case with tags from the Autolink plugins and with // the [url] BBCode when its content is used for the URL - if (!$tag->getEndTag()) + if (!$tag->getEndTag() || !$this->should_shorten($tag, $parser->getText())) { return true; } @@ -65,6 +65,21 @@ class link_helper } /** + * Test whether we should shorten this tag's text + * + * Will test whether the tag either does not use any markup or uses a single + * [url] BBCode + * + * @param \s9e\TextFormatter\Parser\Tag $tag URL tag + * @param string $text Original text + * @return bool + */ + protected function should_shorten(\s9e\TextFormatter\Parser\Tag $tag, $text) + { + return ($tag->getLen() === 0 || strtolower(substr($text, $tag->getPos(), $tag->getLen())) === '[url]'); + } + + /** * Remove the board's root URL from a the start of a string * * @param \s9e\TextFormatter\Parser\Tag $tag LINK_TEXT tag |