aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2015-02-13 11:28:51 +0100
committerJoshyPHP <s9e.dev@gmail.com>2015-04-02 19:16:01 +0200
commitf6e3e41717e71fb43ea63785cfe7980e33be3fbf (patch)
tree79a5f5e975be440147887560699e519ca451201a
parent63753bbf1a7a695938c7196fb7c1d9318d7a7375 (diff)
downloadforums-f6e3e41717e71fb43ea63785cfe7980e33be3fbf.tar
forums-f6e3e41717e71fb43ea63785cfe7980e33be3fbf.tar.gz
forums-f6e3e41717e71fb43ea63785cfe7980e33be3fbf.tar.bz2
forums-f6e3e41717e71fb43ea63785cfe7980e33be3fbf.tar.xz
forums-f6e3e41717e71fb43ea63785cfe7980e33be3fbf.zip
[ticket/11768] Added support for magic links that start with "www."
PHPBB3-11768
-rw-r--r--phpBB/composer.lock9
-rw-r--r--phpBB/phpbb/textformatter/s9e/factory.php2
-rw-r--r--tests/text_formatter/s9e/default_formatting_test.php8
3 files changed, 14 insertions, 5 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index c619b74f15..7538a8a83c 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -169,17 +169,18 @@
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
- "reference": "3659ed8d9209a4a42f23f7169dbcc0a114fd601f"
+ "reference": "2cfaacd8619ecaebb6de5674b94580689f062f66"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/3659ed8d9209a4a42f23f7169dbcc0a114fd601f",
- "reference": "3659ed8d9209a4a42f23f7169dbcc0a114fd601f",
+ "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/2cfaacd8619ecaebb6de5674b94580689f062f66",
+ "reference": "2cfaacd8619ecaebb6de5674b94580689f062f66",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-filter": "*",
+ "lib-pcre": ">=7.2",
"php": ">=5.3.3"
},
"suggest": {
@@ -218,7 +219,7 @@
"parser",
"shortcodes"
],
- "time": "2015-02-06 19:38:34"
+ "time": "2015-02-13 10:24:14"
},
{
"name": "symfony/config",
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index d000262bec..77b1a1c916 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -280,7 +280,7 @@ class factory implements \phpbb\textformatter\cache
// Load the magic links plugins. We do that after BBCodes so that they use the same tags
$configurator->plugins->load('Autoemail');
- $configurator->plugins->load('Autolink');
+ $configurator->plugins->load('Autolink', array('matchWww' => true));
// Register some vars with a default value. Those should be set at runtime by whatever calls
// the parser
diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php
index a7d3235c12..99a89a8d2e 100644
--- a/tests/text_formatter/s9e/default_formatting_test.php
+++ b/tests/text_formatter/s9e/default_formatting_test.php
@@ -193,6 +193,14 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
"[code]\tline1\n line2[/code]",
'<div class="codebox"><p>CODE: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><code>&nbsp; &nbsp;line1<br>' . "\n" . '&nbsp; line2</code></div>'
),
+ array(
+ '... http://example.org ...',
+ '... <a href="http://example.org" class="postlink">http://example.org</a> ...'
+ ),
+ array(
+ '... www.example.org ...',
+ '... <a href="http://www.example.org" class="postlink">www.example.org</a> ...'
+ ),
);
}
}